Refactored traits from message so it might be easier to reuse them.
Authored by: glynos 2009-11-11
Parent: [r193]
Child: [r195]