Fixed identing and spacing
Merge pull request #1599 from mvdriel/fix-identing

Fixed identing and spacing
Load helpers of email view
Merge pull request #1600 from aleho/master

Load helpers of email view