Merge master and fix conflicts

1 files changed, 2 insertions, 1 deletions

diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp

index 8e67375d..a197e4aa 100644
--- a/src/MxcImageProvider.cpp
+++ b/src/MxcImageProvider.cpp
@@ -17,7 +17,8 @@ MxcImageResponse::run()
                 auto data = cache::image(fileName);
                 if (!data.isNull()) {
                         m_image = utils::readImage(&data);
-                        m_image = m_image.scaled(m_requestedSize, Qt::KeepAspectRatio);
+                        m_image = m_image.scaled(
+                          m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                         m_image.setText("mxc url", "mxc://" + m_id);
 
                         if (!m_image.isNull()) {