Message delete refactored
Message delete refactored