deprecation patch
message management bugfixing