diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 7baee23f9ba8877b1ba42069a7a9728f31b936a8..4d91593147c396950561f9f6d0761beed1150798 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -473,6 +473,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 			return get(message.getCounterparts(), size, cachedOnly);
 		} else if (message.getStatus() == Message.STATUS_RECEIVED) {
 			Contact c = message.getContact();
+			if (message.getModerated() != null) c = null;
 			if (c != null && (c.getProfilePhoto() != null || c.getAvatarFilename() != null)) {
 				return get(c, size, cachedOnly);
 			} else if (conversation instanceof Conversation && message.getConversation().getMode() == Conversation.MODE_MULTI) {
@@ -484,6 +485,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 				} else {
 					user = mucOptions.findUserByFullJid(message.getCounterpart());
 				}
+				if (message.getModerated() != null) user = null;
 				if (user != null) {
 					return getImpl(user, size, cachedOnly);
 				}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index a043bef84e8664c329479612e475a454f4fb69a7..f76bd8fb84e66bd120d5287659f1532f0c0eef1e 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -212,7 +212,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         if (viewHolder.edit_indicator != null) {
-            if (message.edited()) {
+            if (message.edited() && message.getModerated() == null) {
                 viewHolder.edit_indicator.setVisibility(View.VISIBLE);
                 viewHolder.edit_indicator.setImageResource(darkBackground ? R.drawable.ic_mode_edit_white_18dp : R.drawable.ic_mode_edit_black_18dp);
                 viewHolder.edit_indicator.setAlpha(darkBackground ? 0.7f : 0.57f);
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 6468fcc150fefc83d3c00d3dbc73f91dab5d7346..d98db6df87c167c5de0c88a2e65e811228bbaa79 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -531,6 +531,8 @@ public class UIHelper {
     }
 
     public static String getMessageDisplayName(final Message message) {
+        if (message.getModerated() != null) return "moderated";
+
         final Conversational conversation = message.getConversation();
         if (message.getStatus() == Message.STATUS_RECEIVED) {
             final Contact contact = message.getContact();