don't remove @message field