diff --git a/src/core/autotests/messagetest.cpp b/src/core/autotests/messagetest.cpp
--- a/src/core/autotests/messagetest.cpp
+++ b/src/core/autotests/messagetest.cpp
@@ -95,6 +95,8 @@
         attImage.setTitle(QStringLiteral("Clipboard"));
         attImage.setLink(QStringLiteral("/file-upload/Kt7DBWPe7pnadXDQH/test file"));
         attImage.setMimeType(QStringLiteral("image/png"));
+        attImage.setImageWidth(120);
+        attImage.setImageHeight(120);
         imageMessageRef.setAttachements({attImage});
 
         QTest::addRow("image") << QStringLiteral("image") << imageMessageRef;
diff --git a/src/core/messages/message.cpp b/src/core/messages/message.cpp
--- a/src/core/messages/message.cpp
+++ b/src/core/messages/message.cpp
@@ -339,15 +339,9 @@
                     messageAttachement.setImageWidth(imageDimensionsParams.value(QLatin1String("width")).toInt());
                     //TODO validate image size
                 } else {
-                    //Use default value ?
-                    if (attachment.contains(QLatin1String("image_preview"))) {
-                        messageAttachement.setImageHeight(120);
-                        messageAttachement.setImageWidth(120);
-                    } else {
-                        //We don't have dimension so we can't load it.
-                        //=>convert to normaltext
-                        mMessageType = Message::MessageType::NormalText;
-                    }
+                    //Use default value
+                    messageAttachement.setImageHeight(120);
+                    messageAttachement.setImageWidth(120);
                 }
             }