Cleaning up a little.
Adding basic fallback for email messages.