More patches to UserMailer