[smtp-via-smtp] Invalid "MAIL FROM:" command

[Jesper Harder]

In GNU Emacs 21.3.50.42 (i686-pc-linux-gnu, GTK+ Version 2.0.2)
 of 2003-09-20 on defun.localdomain

`smtp-via-smtp' inserts a space between the "MAIL FROM:" and
"RCPT TO:" SMTP commands and the following address,

      MAIL FROM: <address@hidden>

This syntax is invalid according to RFC2821 -- the address must follow
immediately after the ':'

      MAIL FROM:<address@hidden>


diff -c /home/harder/emacs/lisp/mail/smtpmail.el.\~1.60.\~ 
/home/harder/emacs/lisp/mail/smtpmail.el
*** /home/harder/emacs/lisp/mail/smtpmail.el.~1.60.~    Mon Sep  1 22:29:06 2003
--- /home/harder/emacs/lisp/mail/smtpmail.el    Tue Sep 23 22:14:51 2003
***************
*** 671,677 ****
                          (>= (car response-code) 400))
                      (throw 'done nil))))
  
!           ;; MAIL FROM: <sender>
            (let ((size-part
                   (if (or (member 'size supported-extensions)
                           (assoc 'size supported-extensions))
--- 671,677 ----
                          (>= (car response-code) 400))
                      (throw 'done nil))))
  
!           ;; MAIL FROM:<sender>
            (let ((size-part
                   (if (or (member 'size supported-extensions)
                           (assoc 'size supported-extensions))
***************
*** 706,712 ****
                         "")
                     "")))
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
!             (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
                                                       envelope-from
                                                     size-part
                                                     body-part))
--- 706,712 ----
                         "")
                     "")))
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
!             (smtpmail-send-command process (format "MAIL FROM:<%s>%s%s"
                                                       envelope-from
                                                     size-part
                                                     body-part))
***************
*** 717,726 ****
                  (throw 'done nil)
                ))
  
!           ;; RCPT TO: <recipient>
            (let ((n 0))
              (while (not (null (nth n recipient)))
!               (smtpmail-send-command process (format "RCPT TO: <%s>" 
(smtpmail-maybe-append-domain (nth n recipient))))
                (setq n (1+ n))
  
                (setq response-code (smtpmail-read-response process))
--- 717,726 ----
                  (throw 'done nil)
                ))
  
!           ;; RCPT TO:<recipient>
            (let ((n 0))
              (while (not (null (nth n recipient)))
!               (smtpmail-send-command process (format "RCPT TO:<%s>" 
(smtpmail-maybe-append-domain (nth n recipient))))
                (setq n (1+ n))
  
                (setq response-code (smtpmail-read-response process))