Temporary removed mail labeling as broke the merge
Merge pull request #60 from Zentyal/mjulian/merge-fixes

Temporary removed mail labeling as broke the merge