I suggest moving these back into wrap-message and removing emailMessage.set method