diff --git a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
index cb284c781f4019858a14fdbb84e65472eafc22fa..1e49f66093196c53e0bb23b38c48331fd1fde6b2 100644
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
@@ -114,7 +114,7 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
             System.out.println("Enabling desktopgui");
         }
         try {
-            RouterManager.getRouterContext().setProperty(property, value);
+            RouterManager.getRouterContext().router().saveConfig(property, value);
         } catch (Exception ex) {
             Logger.getLogger(DesktopguiConfigurationFrame.class.getName()).log(Level.SEVERE, null, ex);
         }
diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java
index d866b210b9ef9b21c991bbe2cf3d2e0da17ad852..0709d6578f4b8875df531546fdffb89370e440fa 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java
@@ -28,7 +28,6 @@ import i2p.susi.util.ReadBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
 
 /**
  * @author susi
@@ -58,7 +57,7 @@ public class Base64 implements Encoding {
 	 */
 	public String encode(String str) throws EncodingException {
 		try {
-			return encode( new StringBufferInputStream( str ) );
+			return encode( new ByteArrayInputStream( str.getBytes() ) );
 		}catch (IOException e) {
 			throw new EncodingException( e.getMessage() );
 		}
diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java
index 96dab529520a2d5870ef862191235166eff70c72..8ce8a8e4dda6fb9085a927ae757017cb1b4e36dd 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java
@@ -29,7 +29,6 @@ import i2p.susi.util.ReadBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
 
 /**
  * @author susi
@@ -47,7 +46,7 @@ public class HeaderLine implements Encoding {
 	 */
 	public String encode(String text) throws EncodingException {
 		try {
-			return encode( new StringBufferInputStream( text ) );
+			return encode( new ByteArrayInputStream( text.getBytes() ) );
 		} catch (IOException e) {
 			throw new EncodingException( "IOException occured." );
 		}
diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java
index 2194b24c0c0d939d17f4946d427dd74cb54015cd..fd7006f7a821ccffdfec9f2c2deb20b185a20acf 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java
@@ -29,7 +29,6 @@ import i2p.susi.util.ReadBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
 
 /**
  * @author susi
@@ -57,7 +56,7 @@ public class QuotedPrintable implements Encoding {
 	 */
 	public String encode(String text) throws EncodingException {
 		try {
-			return encode( new StringBufferInputStream( text ) );
+			return encode( new ByteArrayInputStream( text.getBytes() ) );
 		}catch (IOException e) {
 			throw new EncodingException( "IOException occured." );
 		}