Emailbox margin-right "fix" and refactoring code