diff --git a/calexium_lib/mail/send_mail.anubis b/calexium_lib/mail/send_mail.anubis
index fa3d395..619e1b3 100644
--- a/calexium_lib/mail/send_mail.anubis
+++ b/calexium_lib/mail/send_mail.anubis
@@ -155,7 +155,7 @@ define Reply_Result
   if receive_command(conn, [], time_out) is
   {
     failure       then logError(send_mail_log, "receive_reply: error receiving command"); error,
-    timeout       then logError(send_mail_log, "receive_reply: timeout receiving command"); timeout,
+    timeout       then (if time_out > 0 then logError(send_mail_log, "receive_reply: timeout receiving command") else unique); timeout,
     success(line) then  
       //check if we must read another line by presence of hyphen after the reply code
       //220-bla bla bla
@@ -355,7 +355,7 @@ public define SendContentResult
     RWStream target,
     Int   so_far
   ) =
-  if receive_reply(weaken(target), [], smtp_time_out) is
+  if receive_reply(weaken(target), [], 0) is
   {
     error then copy_error(so_far),
     timeout then
--
libgit2 0.21.4