diff --git a/class.smtp.php b/class.smtp.php
index 3ac43ff35..b17f71e6d 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -177,7 +177,9 @@ protected function edebug($str)
                 break;
             case 'echo':
             default:
-                echo gmdate('Y-m-d H:i:s')."\t".trim($str)."\n";
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\r\n", "\r\n                   \t                  ", trim($str)
+                )."\n";
         }
     }