Merge in fixes from stustross

Specifically kwargs in EmailMessage