Merge emails.py into authoring.py