email: Removed unnecessary return statements

Small tidy up to remove unnecessary return statements prior to the next
fix.