JBTM-2010 moved back to using a messagelistener