Added remote changes from server-unstable to EmailReceiver.py