Some functionality added connected with messages.