diff --git a/src/messages/image.cpp b/src/messages/image.cpp
index ce92e815b..732d56cd3 100644
--- a/src/messages/image.cpp
+++ b/src/messages/image.cpp
@@ -240,7 +240,7 @@ int Image::getWidth() const
 
 int Image::getScaledWidth() const
 {
-    return static_cast<int>(this->getWidth() * this->scale *
+    return static_cast<int>((float)this->getWidth() * this->scale *
                             getApp()->settings->emoteScale.getValue());
 }
 
@@ -254,7 +254,7 @@ int Image::getHeight() const
 
 int Image::getScaledHeight() const
 {
-    return static_cast<int>(this->getHeight() * this->scale *
+    return static_cast<int>((float)this->getHeight() * this->scale *
                             getApp()->settings->emoteScale.getValue());
 }
 
diff --git a/src/messages/messageelement.cpp b/src/messages/messageelement.cpp
index d53a6a2e4..c84f45666 100644
--- a/src/messages/messageelement.cpp
+++ b/src/messages/messageelement.cpp
@@ -70,8 +70,8 @@ ImageElement::ImageElement(Image *_image, MessageElement::Flags flags)
 void ImageElement::addToContainer(MessageLayoutContainer &container, MessageElement::Flags _flags)
 {
     if (_flags & this->getFlags()) {
-        QSize size(this->image->getScaledWidth() * this->image->getScale() * container.getScale(),
-                   this->image->getScaledHeight() * this->image->getScale() * container.getScale());
+        QSize size(this->image->getScaledWidth() * container.getScale(),
+                   this->image->getScaledHeight() * container.getScale());
 
         container.addElement(
             (new ImageLayoutElement(*this, this->image, size))->setLink(this->getLink()));