diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index f6298ea2..5650b894 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1135,7 +1135,8 @@ public class XmppConnectionService extends Service {
 
 			}
 			if (packet != null) {
-				if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) {
+				if (account.getXmppConnection().getFeatures().sm()
+						|| (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) {
 					message.setStatus(Message.STATUS_UNSEND);
 				} else {
 					message.setStatus(Message.STATUS_SEND);
@@ -1177,7 +1178,8 @@ public class XmppConnectionService extends Service {
 
 		if (resend) {
 			if (packet != null && addToConversation) {
-				if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) {
+				if (account.getXmppConnection().getFeatures().sm()
+						|| (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) {
 					markMessage(message, Message.STATUS_UNSEND);
 				} else {
 					markMessage(message, Message.STATUS_SEND);