[Bug 952449] [Messages] Fix the un-fixed issues reported in the rev...

...iew of Bug #907740