adds fix for message within message, content boundaries problem