2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfb630c5e3d..e5c2e2ad628 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-via-smtp): Make sure we don't send
+        QUIT twice.
+
 2011-06-22  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-default-specifiers)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 7385eab4977..58a517ba836 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -741,6 +741,7 @@ The list is in preference order.")
                 (smtpmail-send-command process "QUIT")
                 (smtpmail-read-response process)
                 (delete-process process)
+                (setq process nil)
                 (throw 'done
                        (smtpmail-via-smtp recipient smtpmail-text-buffer t)))
                (t
@@ -768,6 +769,7 @@ The list is in preference order.")
                   (smtpmail-send-command process "QUIT")
                   (smtpmail-read-response process)
                   (delete-process process)
+                  (setq process nil)
                   (throw 'done
                          (smtpmail-via-smtp recipient smtpmail-text-buffer t)))
                  (t