diff --git a/src/cheogram/java/com/cheogram/android/EmojiSearch.java b/src/cheogram/java/com/cheogram/android/EmojiSearch.java
index 72f22cc616b058240651fd721d4e1631ee876de5..818719a9646f2986a141ebf2aa220b793d60ea9c 100644
--- a/src/cheogram/java/com/cheogram/android/EmojiSearch.java
+++ b/src/cheogram/java/com/cheogram/android/EmojiSearch.java
@@ -175,9 +175,10 @@ public class EmojiSearch {
 		protected final String source;
 		protected final Drawable icon;
 
-		public CustomEmoji(final String shortcode, final String source, final Drawable icon) {
-			super(null, 10, shortcode);
+		public CustomEmoji(final String shortcode, final String source, final Drawable icon, final String tag) {
+			super(null, 10, shortcode + ">" + tag);
 			shortcodes.add(shortcode);
+			if (tag != null) tags.add(tag);
 			this.source = source;
 			this.icon = icon;
 			if (icon == null) {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 7236f89b11d6523c3ab7685e9f8a9a7e485014e1..ba80a7556262fd90ebd966799edc5198b0f93423 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -757,7 +757,10 @@ public class XmppConnectionService extends Service {
                             }
                             final String filename = Files.getNameWithoutExtension(df.getName());
                             Cid[] cids = fileBackend.calculateCids(new FileInputStream(df));
-                            emojiSearch.addEmoji(new EmojiSearch.CustomEmoji(filename, cids[0].toString(), icon));
+                            for (Cid cid : cids) {
+                                saveCid(cid, file);
+                            }
+                            emojiSearch.addEmoji(new EmojiSearch.CustomEmoji(filename, cids[0].toString(), icon, file.getParentFile().getName()));
                         }
                     } catch (final Exception e) {
                         Log.w(Config.LOGTAG, "rescanStickers: " + e);