diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
index e1b956507..01b06c226 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -75,6 +75,11 @@ public class XmppAxolotlMessage {
 		public String getPlaintext() {
 			return plaintext;
 		}
+
+		public AxolotlService.XmppAxolotlSession getSession() {
+			return session;
+		}
+
 	}
 
 	public XmppAxolotlMessage(Contact contact, Element axolotlMessage) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index f67292307..fb8b180e1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -660,4 +660,8 @@ public class Message extends AbstractEntity {
 	public boolean isTrusted() {
 		return this.axolotlSession != null && this.axolotlSession.isTrusted();
 	}
+
+	public void setAxolotlSession(AxolotlService.XmppAxolotlSession session) {
+		this.axolotlSession = session;
+	}
 }