Email Templates Plugin - Updates #2