diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index add51d522..d800cfd4b 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -56,7 +56,7 @@ public class Conversation extends AbstractEntity {
 
 	private transient String otrFingerprint = null;
 
-	private int nextMessageEncryption =  Message.ENCRYPTION_NONE;
+	private int nextMessageEncryption = -1;
 	private String nextMessage;
 
 	private transient MucOptions mucOptions = null;
@@ -332,6 +332,9 @@ public class Conversation extends AbstractEntity {
 	}
 	
 	public int getNextEncryption() {
+		if (this.nextMessageEncryption == -1) {
+			return this.getLatestEncryption();
+		}
 		return this.nextMessageEncryption;
 	}
 	
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index ca59c8822..ebfeb8a33 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -565,8 +565,6 @@ public class ConversationFragment extends Fragment {
 			this.messageListAdapter.notifyDataSetChanged();
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				if (messageList.size() >= 1) {
-					conversation.setNextEncryption(conversation
-							.getLatestEncryption());
 					makeFingerprintWarning(conversation.getLatestEncryption());
 				}
 			} else {