diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index b5c5f592cf5435ef5577ff3889099b3aea82ff26..098285e224258c13b68f6ec7124d2ea52b40fcf2 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -683,12 +683,16 @@ public class ConversationFragment extends Fragment {
 					break;
 				}
 			}
-			for(Message message : this.conversation.getMessages()) {
-				if (!this.messageList.contains(message)) {
-					this.messageList.add(message);
+			if (this.conversation.getMessages().size() == 0) {
+				this.messageList.clear();
+			} else {
+				for(Message message : this.conversation.getMessages()) {
+					if (!this.messageList.contains(message)) {
+						this.messageList.add(message);
+					}
 				}
+				updateStatusMessages();
 			}
-			updateStatusMessages();
 			this.messageListAdapter.notifyDataSetChanged();
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				if (messageList.size() >= 1) {