diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index b793f9a1f..daa569de5 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -66,6 +66,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		Message message = conversation.getLatestMessage();
 		int unreadCount = conversation.unreadCount();
+		if (unreadCount > 0) {
+			unreadCountCustomView.setVisibility(View.VISIBLE);
+			unreadCountCustomView.setUnreadCount(unreadCount);
+		} else {
+			unreadCountCustomView.setVisibility(View.GONE);
+		}
 
 		if (!conversation.isRead()) {
 			convName.setTypeface(null, Typeface.BOLD);
@@ -84,12 +90,6 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message);
 			mLastMessage.setVisibility(View.VISIBLE);
 			imagePreview.setVisibility(View.GONE);
-			if (unreadCount > 0) {
-				unreadCountCustomView.setVisibility(View.VISIBLE);
-				unreadCountCustomView.setUnreadCount(unreadCount);
-			} else {
-				unreadCountCustomView.setVisibility(View.GONE);
-			}
 			mLastMessage.setText(preview.first);
 			if (preview.second) {
 				if (conversation.isRead()) {