New Message Crashfix 2.0