Make null phone number interpolation work on subject page
Expand test coverage for messages