Change email action type tag checking and add storage of message
Fix storage of message body for email action type