Modified message formatting