diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
index ad9eff72a..129de87c6 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
@@ -28,7 +28,7 @@ public class Java7Base64Encoder implements org.jivesoftware.smack.util.stringenc
 
     private static Java7Base64Encoder instance = new Java7Base64Encoder();
 
-    private static int BASE64_ENCODER_FLAGS =  Base64.URL_SAFE;
+    private static int BASE64_ENCODER_FLAGS =  Base64.DONT_BREAK_LINES;
 
     private Java7Base64Encoder() {
         // Use getInstance()