Integrate "inline images" patch

See https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-inline-images-in-mail/+merge/206433