#1157 better message layout for now