CiviMail - Address display format not respected when domain.address token is used in HTML message body - line breaks are missing

The format of the domain.address in CiviMail mailings should follow the configured display address format including line breaks. This works fine in TEXT email output. However in the HTML message, we need to add HTML line breaks (<br />) between each line.

EXAMPLE (snippet) of current output:

---- TEXT -----
Our contact info:
S 15S El Camino Way E
Collinsville, CT 16022
United States

---- HTML ----
--=_fe4e562f484ba52ea84c79a032030e1a
Content-Transfer-Encoding: 8bit
Content-Type: text/html; charset="utf-8"

Our contact info:<br />
S 15S El Camino Way E
Collinsville, CT 16022
United States</p>