Moved messages fields fix to master