1 files changed, 2 insertions, 2 deletions
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 c44796ba..c4b1e6fc 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -567,7 +567,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					wasEncrypted = true;
 					break;
 				}
-				if (iterator.getRemoteMsgId() == null && iterator.getType() == SENT) {
+				if (!iterator.isCarbon() && iterator.getType() == SENT) {
 					break;
 				}
 			}
@@ -577,7 +577,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					willBeEncrypted = true;
 					break;
 				}
-				if (iterator.getRemoteMsgId() == null && iterator.getType() == SENT) {
+				if (!iterator.isCarbon() && iterator.getType() == SENT) {
 					break;
 				}
 			}