Split out smtp_write_mail_and_rcpt_cmds() from smtp_deliver()