2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 814c5ef89fa..4b81098fb9e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-09  Glenn Morris  <rgm@gnu.org>
+
+        * mail/smtpmail.el (smtpmail-send-it): Revert previous change.
+
 2010-12-08  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-handle-start-file-process): Protect
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 1bf3fbe4a59..62bfbb740c4 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -379,7 +379,7 @@ The list is in preference order.")
             (let* ((file-data
                     (expand-file-name
                      (format "%s_%i"
-                             (format-time-string "%Y-%m-%d_%H-%M-%S")
+                             (format-time-string "%Y-%m-%d_%H:%M:%S")
                              (setq smtpmail-queue-counter
                                    (1+ smtpmail-queue-counter)))
                      smtpmail-queue-dir))