Streamlines address format and adds comments for translators
Optimizes text e-mail layout
Merge pull request #137 from nsendetzky/master

Streamlines address format, optimizes text e-mail layout