diff --git a/src/app/messagesadapter.cpp b/src/app/messagesadapter.cpp
index 620d5ea5df448ffee2b83fec159f064af90be5bb..7ae08d002a9c3719714ccb388c69f10c3205e3e3 100644
--- a/src/app/messagesadapter.cpp
+++ b/src/app/messagesadapter.cpp
@@ -589,6 +589,9 @@ MessagesAdapter::isLocalImage(const QString& mimename)
                                      [fileFormat](QByteArray format) {
                                          return format == fileFormat;
                                      });
+        if (*iterator == "gif") {
+            return {{"isAnimatedImage", true}};
+        }
         return {{"isImage", iterator != supportedFormats.end()}};
     }
     return {{"isImage", false}};
@@ -610,7 +613,6 @@ MessagesAdapter::getMediaInfo(const QString& msg)
         return fileInfo;
     }
     static const QRegExp vPattern("(video/)(avi|mov|webm|webp|rmvb)$", Qt::CaseInsensitive);
-    auto match = vPattern.indexIn(mime.name());
     QString type = vPattern.capturedTexts().size() == 3 ? vPattern.capturedTexts()[1] : "";
     if (!type.isEmpty()) {
         return {
@@ -619,7 +621,6 @@ MessagesAdapter::getMediaInfo(const QString& msg)
         };
     } else {
         static const QRegExp aPattern("(audio/)(ogg|flac|wav|mpeg|mp3)$", Qt::CaseInsensitive);
-        match = aPattern.indexIn(mime.name());
         type = aPattern.capturedTexts().size() == 3 ? aPattern.capturedTexts()[1] : "";
         if (!type.isEmpty()) {
             return {