Fixed logic hiding empty fields in the message preview