Even more email changes

Minor changes, comments included now.
Also made it compatible with MainArea.