Fix email layouts