Displaying mail correctly

fixes #65
fixes #63
Merge branch 'develop' into feature/fixmail