diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 5674f84a962b5cc6a20c910c76ea1bceb2027b90..20c70d29d0f3bc43db5dc01ed822b1f397c1c80e 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -341,7 +341,11 @@ public class Conversation extends AbstractEntity {
 	}
 	
 	public String getNextMessage() {
-		return this.nextMessage;
+		if (this.nextMessage==null) {
+			return "";
+		} else {
+			return this.nextMessage;
+		}
 	}
 	
 	public void setNextMessage(String message) {