1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
index e0d627b9..5e629485 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -181,6 +181,7 @@ public final class MessageUtil {
         switch (message.getStatus()) {
             case Message.STATUS_SEND:
             case Message.STATUS_SEND_DISPLAYED:
+            case Message.STATUS_SEND_FAILED:
             case Message.STATUS_SEND_RECEIVED:
                 return true;
             default:
@@ -283,7 +284,7 @@ public final class MessageUtil {
             fileParams.setHeight(imageHeight);
         }
         String relativeFilePathFromMessage = message.getRelativeFilePath();
-        if (null != relativeFilePathFromMessage && relativeFilePathFromMessage.startsWith("/")) {
+        if (null != relativeFilePathFromMessage && relativeFilePathFromMessage.startsWith("/") && (null == fileParams.getPath() || !relativeFilePathFromMessage.equals(fileParams.getPath()))) {
             fileParams.setPath(relativeFilePathFromMessage);
         }
     }