diff --git a/source/org/jivesoftware/smack/XMPPException.java b/source/org/jivesoftware/smack/XMPPException.java
index 53b083c43..2d509d6b3 100644
--- a/source/org/jivesoftware/smack/XMPPException.java
+++ b/source/org/jivesoftware/smack/XMPPException.java
@@ -195,12 +195,14 @@ public class XMPPException extends Exception {
 
     public String toString() {
         StringBuffer buf = new StringBuffer();
-        if (wrappedThrowable != null) {
-            buf.append(wrappedThrowable);
-        }
+        buf.append(super.toString());
         if (error != null) {
-            buf.append(" -- ").append(error);
+            buf.append(": ").append(error);
         }
+        if (wrappedThrowable != null) {
+            buf.append("\n  -- caused by: ").append(wrappedThrowable);
+        }
+
         return buf.toString();
     }
 }
\ No newline at end of file