diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
index 4bb634b54..97f997f48 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
@@ -45,18 +45,28 @@ import java.util.List;
 public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
         implements IFilterable<String> {
 
-    private String userId;
+    private String objectId;
     private String displayName;
+    private String source;
     private UserEntity currentUser;
 
-    public MentionAutocompleteItem(String userId, String displayName, UserEntity currentUser) {
-        this.userId = userId;
+    public MentionAutocompleteItem(String objectId, String displayName, String source, UserEntity currentUser) {
+        this.objectId = objectId;
         this.displayName = displayName;
+        this.source = source;
         this.currentUser = currentUser;
     }
 
-    public String getUserId() {
-        return userId;
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getObjectId() {
+        return objectId;
     }
 
     public String getDisplayName() {
@@ -67,7 +77,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
     public boolean equals(Object o) {
         if (o instanceof MentionAutocompleteItem) {
             MentionAutocompleteItem inItem = (MentionAutocompleteItem) o;
-            return (userId.equals(inItem.userId) && displayName.equals(inItem.displayName));
+            return (objectId.equals(inItem.objectId) && displayName.equals(inItem.displayName));
         }
 
         return false;
@@ -93,22 +103,22 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
                     String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
                             .getResources().getColor(R.color.colorPrimary));
             if (holder.contactMentionId != null) {
-                FlexibleUtils.highlightText(holder.contactMentionId, "@" + userId,
+                FlexibleUtils.highlightText(holder.contactMentionId, "@" + objectId,
                         String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.getSharedApplication()
                                 .getResources().getColor(R.color.colorPrimary));
             }
         } else {
             holder.contactDisplayName.setText(displayName);
             if (holder.contactMentionId != null) {
-                holder.contactMentionId.setText("@" + userId);
+                holder.contactMentionId.setText("@" + objectId);
             }
         }
 
-        if (userId.equals("all")) {
+        if (source.equals("calls")) {
             holder.avatarFlipView.setFrontImageBitmap(DisplayUtils.getRoundedBitmapFromVectorDrawableResource(NextcloudTalkApplication.getSharedApplication().getResources(), R.drawable.ic_people_group_white_24px));
         } else {
             GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(currentUser.getBaseUrl(),
-                    userId, R.dimen.avatar_size), new LazyHeaders.Builder()
+                    objectId, R.dimen.avatar_size), new LazyHeaders.Builder()
                     .setHeader("Accept", "image/*")
                     .setHeader("User-Agent", ApiUtils.getUserAgent())
                     .build());
@@ -129,7 +139,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
 
     @Override
     public boolean filter(String constraint) {
-        return userId != null && StringUtils.containsIgnoreCase(userId, constraint) ||
+        return objectId != null && StringUtils.containsIgnoreCase(objectId, constraint) ||
                 displayName != null && StringUtils.containsIgnoreCase(displayName, constraint);
 
     }
diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
index 31dc50ef8..4b950365c 100644
--- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
+++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
@@ -51,7 +51,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback<Mention
         editable.replace(start, end, replacement + " ");
         Spans.MentionChipSpan mentionChipSpan =
                 new Spans.MentionChipSpan(DisplayUtils.getDrawableForMentionChipSpan(context,
-                        item.getId(), item.getLabel(), conversationUser, "user",
+                        item.getId(), item.getLabel(), conversationUser, item.getSource(),
                         R.xml.chip_accent_background),
                         DynamicDrawableSpan.ALIGN_BASELINE,
                         item.getId(), item.getLabel());
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
index 4d02460ea..f6f32dd98 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java
@@ -20,6 +20,7 @@
 package com.nextcloud.talk.models.json.mention;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonIgnore;
 import com.bluelinelabs.logansquare.annotation.JsonObject;
 import lombok.Data;
 import org.parceler.Parcel;
@@ -34,7 +35,7 @@ public class Mention {
     @JsonField(name = "label")
     String label;
 
-    // type of user (guests or users)
+    // type of user (guests or users or calls)
     @JsonField(name = "source")
     String source;
 }
diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
index 7d1d2204a..2f7445d15 100644
--- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
+++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
@@ -113,7 +113,8 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
                             List<AbstractFlexibleItem> internalAbstractFlexibleItemList = new ArrayList<>();
                             for (Mention mention : mentionsList) {
                                 internalAbstractFlexibleItemList.add(
-                                        new MentionAutocompleteItem(mention.getId(), mention.getLabel(),
+                                        new MentionAutocompleteItem(mention.getId(),
+                                                mention.getLabel(), mention.getSource(),
                                                 currentUser));
                             }
 
@@ -143,9 +144,9 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
         Mention mention = new Mention();
         MentionAutocompleteItem mentionAutocompleteItem = (MentionAutocompleteItem) adapter.getItem(position);
         if (mentionAutocompleteItem != null) {
-            mention.setId(mentionAutocompleteItem.getUserId());
+            mention.setId(mentionAutocompleteItem.getObjectId());
             mention.setLabel(mentionAutocompleteItem.getDisplayName());
-            mention.setSource("users");
+            mention.setSource(mentionAutocompleteItem.getSource());
             dispatchClick(mention);
         }
         return true;
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
index 51eb9aac6..d86f9a079 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
@@ -70,6 +70,7 @@ import com.vanniktech.emoji.EmojiTextView;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -228,7 +229,9 @@ public class DisplayUtils {
 
         int drawable;
 
-        if (!"call".equals(type)) {
+        boolean isCall = "call".equals(type) || "calls".equals(type);
+
+        if (!isCall) {
             if (chipResource == R.xml.chip_accent_background) {
                 drawable = R.drawable.white_circle;
             } else {
@@ -242,7 +245,7 @@ public class DisplayUtils {
 
         chip.setBounds(0, 0, chip.getIntrinsicWidth(), chip.getIntrinsicHeight());
 
-        if (!"call".equals(type)) {
+        if (!isCall) {
             ImageRequest imageRequest =
                     getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(conversationUser.getBaseUrl(), id, R.dimen.avatar_size_big));
             ImagePipeline imagePipeline = Fresco.getImagePipeline();
@@ -255,7 +258,6 @@ public class DisplayUtils {
                         protected void onNewResultImpl(Bitmap bitmap) {
                             if (bitmap != null) {
                                 chip.setChipIcon(getRoundedDrawable(new BitmapDrawable(bitmap)));
-                                chip.invalidateSelf();
                             }
                         }