Added forgotten non-null check
Added SMS / PUSH transport labels to incomming messages
Added a preference to control incoming message transport type preference
Modified color values
Added background color as option to display incoming message type
removed junk comment
fixed indentation