Re-enabled email support, with better title handling.
Updates to allow better handling of titles.