diff --git a/src/org/yaaic/view/ConversationActivity.java b/src/org/yaaic/view/ConversationActivity.java
index 67e7e5d..7ac652b 100644
--- a/src/org/yaaic/view/ConversationActivity.java
+++ b/src/org/yaaic/view/ConversationActivity.java
@@ -248,7 +248,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 				}
 			}
 			
-			if (deckAdapter.isSwitched()) {
+			if (deckAdapter.isSwitched() && target.equals(deckAdapter.getSwitchedName())) {
 				MessageListView switchedView = deckAdapter.getSwitchedView();
 				switchedView.getAdapter().addMessage(message);
 			}