merge https://code.djangoproject.com/attachment/ticket/17444/set_mail_to_header.2.diff