Fixed messaging to show if there are no messages