MOB-2772 fix for message field