Added properply messageContext setup
Authored by: shatzing5 2016-04-11
Parent: [r6952]
Child: [r6954]