adjusted markup and added Pony for mails