refactor email add JMS