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 2a250d1ecce30728d8f7f2e2a2fdbb9ad659f370..c18b9eac8b4221c45d79a3af84308d0f7bf23ba4 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java
@@ -317,14 +317,15 @@ public class HeaderLine implements Encoding {
 	}
 
 /*****
+TODO put UTF-8 back and move to a unit test
 	public static void main( String[] args ) throws EncodingException {
 		String text = "Subject: test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test \r\n" +
-		"From: Smörebröd <smoerebroed@mail.i2p>\r\n" +
-		"To: äöüß <lalala@mail.i2p>\r\n";
+		"From: UTF8 <smoerebroed@mail.i2p>\r\n" +
+		"To: UTF8 <lalala@mail.i2p>\r\n";
 		HeaderLine hl = new HeaderLine();
 		System.out.println( hl.encode( text ) );
-		System.out.println( hl.encode( "test ÄÖÜ" ) );
-		System.out.println( hl.encode( "Здравствуйте" ) );
+		System.out.println( hl.encode( "test UTF8" ) );
+		System.out.println( hl.encode( "UTF8" ) );
 	}
 ****/
 }