Remove group_id from incoming endpoint

Also build email body in a separate function