Updated e-mail layout