Templates and layouts support added, plain text & html multipart messages