Fixed a few issues with embedded attachments and extended edit