Eshop Noticfication email.

After upgrading to eShop 1.4, I am seeing [SHIPPING_ADDRESS_2] and [SHIPPING_POSTCODE] in the shipping address box of the customer and admin notification emails, even though the customer has not put shipping information in for the purchase. (See Image3.gif attached.) I am talking about downloadable products.

The General Layout for Shipping Address is shown in Image2.gif and looks correct to me.

The Customer email notification and admin notification email configuration under System -> Messages is as shown in Image1.gif. It only has [SHIPPING_ADDRESS].

How can we have this un-needed text, [SHIPPING_ADDRESS_2] and [SHIPPING_POSTCODE] , removed when there is no shipping address.

Thanks,
David