Bug fix in Messaging Controller