Multiple gmail accounts and SMTP (again)

[Johnny <yggdrasil@gmx.co.uk>]

I am attempting to set up a second gmail account, and have some trouble
in getting the outgoing mail to behave nicely. Summarising, I want to
send mail from either gmail-account with "From" address set
accordingly. Below, a ramble about my attempts so far.


In setting up the IMAP part, I defined the virtual server names and used
those in authinfo to successfully differentiate between the accounts:
In .gnus.el:
       (nnimap "gmail1"
	       (nnimap-address "imap.gmail.com")
	       (nnimap-server-port 993)
	       (nnimap-stream ssl)
	       (nnimap-list-pattern inbox-)
	       )
        (nnimap "gmail2"
	       (nnimap-address "imap.gmail.com")
	       (nnimap-server-port 993)
	       (nnimap-stream ssl)
	       (nnimap-list-pattern inbox-)
	       )

And then in .authinfo:
 machine gmail1 login gmail1@gmail.com password gmail1pass port 993
 machine gmail2 login gmail2@gmail.com password gmail2pass port 993

This makes the IMAP work well. All good so far. 

(For SMTP, I am using the emacs-wiki setup, as described here: http://www.emacswiki.org/emacs/MultipleSMTPAccounts)

I then attempted to use virtual server names for SMTP as well, i.e.:
In .gnus.el:
(setq smtp-accounts '(
                      (ssl "gmail1" "smtp.gmail.com" "587"
                            "gmail1@gmail.com" nil)
                      (ssl "gmail2" "smtp.gmail.com" "587"
                            "gmail2@gmail.com" nil)))

And in authinfo:
 machine gmail1 login gmail1@gmail.com password gmail1pass port 587
 machine gmail2 login gmail2@gmail.com password gmail2pass port 587

This breaks the sendmail/authinfo functionality such that I have to
enter credentials every time sending mail from either account.

If I instead replace the 2 lines above in authinfo with:
 machine smtp.gmail.com login gmail1@gmail.com password gmail1pass port 587

This makes mailing from both addresses work. I /think/ the setup makes
gmail2 use gmail1's SMTP credentials to send the mail (note that I
didn't have to do any changes in .gnus.el on the gmail2 credentials),
and indeed, when it is received, the posting-styles for gmail2 is used,
but the senders mail address has been changed to gmail1, which I do not
fancy at all.

Any ideas on how to enable using either gmail as sender?

Cheers
-- 
Johnny