Update loading info
Merge pull request #699 from achamely/master

Loading/Updating Message cleanup