Do not double encode message bodies

Change-Id: I4e500362d800c2cdc70bfd7e55aa1b0fca638eea