diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 1054a52baec0f7a1a3d700135c8a2449d014abfa..5add25ed1697b65c1857b49cd286d30d437c395b 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -435,11 +435,13 @@ public class UIHelper {
 			return context.getString(R.string.audio);
 		} else if (mime.startsWith("video/")) {
 			return context.getString(R.string.video);
+		} else if (mime.equals("image/gif")) {
+			return context.getString(R.string.gif);
 		} else if (mime.startsWith("image/")) {
 			return context.getString(R.string.image);
 		} else if (mime.contains("pdf")) {
 			return context.getString(R.string.pdf_document);
-		} else if (mime.contains("application/vnd.android.package-archive")) {
+		} else if (mime.equals("application/vnd.android.package-archive")) {
 			return context.getString(R.string.apk);
 		} else if (mime.contains("vcard")) {
 			return context.getString(R.string.vcard);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c108740c2f89d12042367c1558c769d0a37a2dbe..6afecb7befdd4859d387824475b1cca1434f6168 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -704,4 +704,5 @@
     <string name="please_wait">Please wait…</string>
     <string name="no_microphone_permission">Conversations needs access to the microphone</string>
     <string name="search_messages">Search messages</string>
+    <string name="gif">GIF</string>
 </resources>