diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index eee7e9fbc..12132726d 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -614,7 +614,7 @@ public class WebMail extends HttpServlet
 					}
 					catch (Exception e1) {
 						showBody = false;
-						reason += _("Part ({0}) not shown, because of {1}", ident, e1.getClass().getName()) + br;
+						reason += _("Part ({0}) not shown, because of {1}", ident, e1.toString()) + br;
 					}
 			}
 			if( html )
diff --git a/history.txt b/history.txt
index cb73fe89f..8748f6f5b 100644
--- a/history.txt
+++ b/history.txt
@@ -3,6 +3,7 @@
    prevent slowdowns or stalls
  * SAM: Add support for RAW on the bridge socket in v3 (ticket #1334)
  * Streaming; Disable fail-fast for now.
+ * SusiMail: Better error message on decode fail
 
 2014-07-15 str4d
  * I2CP: Stubs for I2CP connections over Unix domain sockets
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 8ab24107c..80cfb9c84 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 17;
+    public final static long BUILD = 18;
 
     /** for example "-test" */
     public final static String EXTRA = "";