merge
Merge
mail over gmx, mail layout