Merge mail2png from Vince1988/mail2png