Redo Messaging to support format codes