store: Some email tweaks.