(FR #1726) Wrap HTML attachment as a full document

Change-Id: I2e8b2c9fc7ccb0f591f2d358069cef0445d6ae4d