Adding Disable / Enable check for messaging