made emails little more beautiful
manual merge