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 0b3164f85..981b93ecd 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -204,13 +204,13 @@ public class XmppAxolotlMessage {
 		for (Map.Entry<Integer, byte[]> keyEntry : keys.entrySet()) {
 			Element keyElement = new Element(KEYTAG);
 			keyElement.setAttribute(REMOTEID, keyEntry.getKey());
-			keyElement.setContent(Base64.encodeToString(keyEntry.getValue(), Base64.DEFAULT));
+			keyElement.setContent(Base64.encodeToString(keyEntry.getValue(), Base64.NO_WRAP));
 			headerElement.addChild(keyElement);
 		}
-		headerElement.addChild(IVTAG).setContent(Base64.encodeToString(iv, Base64.DEFAULT));
+		headerElement.addChild(IVTAG).setContent(Base64.encodeToString(iv, Base64.NO_WRAP));
 		if (ciphertext != null) {
 			Element payload = encryptionElement.addChild(PAYLOAD);
-			payload.setContent(Base64.encodeToString(ciphertext, Base64.DEFAULT));
+			payload.setContent(Base64.encodeToString(ciphertext, Base64.NO_WRAP));
 		}
 		return encryptionElement;
 	}