diff --git a/internal_packages/message-list/lib/email-frame.jsx b/internal_packages/message-list/lib/email-frame.jsx
index 92c6c20c8..11c009ef9 100644
--- a/internal_packages/message-list/lib/email-frame.jsx
+++ b/internal_packages/message-list/lib/email-frame.jsx
@@ -78,6 +78,7 @@ export default class EmailFrame extends React.Component {
         extension.renderedMessageBodyIntoDocument({
           document: doc,
           message: this.props.message,
+          iframe: iframeNode,
         });
       } catch (e) {
         NylasEnv.reportError(e);
diff --git a/src/components/evented-iframe.cjsx b/src/components/evented-iframe.cjsx
index 69afdb311..fd78e17d5 100644
--- a/src/components/evented-iframe.cjsx
+++ b/src/components/evented-iframe.cjsx
@@ -189,6 +189,7 @@ class EventedIFrame extends React.Component
       eventAttrs[key] = event[key]
 
     node.dispatchEvent(new MouseEvent(event.type, _.extend({}, eventAttrs, {
+      bubbles: true
       clientX: event.clientX + nodeRect.left
       clientY: event.clientY + nodeRect.top
       pageX: event.pageX + nodeRect.left
diff --git a/src/extensions/message-view-extension.coffee b/src/extensions/message-view-extension.coffee
index 6c9b6c1cf..4a164fdfa 100644
--- a/src/extensions/message-view-extension.coffee
+++ b/src/extensions/message-view-extension.coffee
@@ -30,4 +30,11 @@ class MessageViewExtension
   ###
   @formatMessageBody: ({message}) ->
 
+  ###
+  Public: Modify the rendered message body using the DOM.
+  Runs after messages goes through `formatMessageBody` and is placed
+  into the DOM.
+  ###
+  @renderedMessageBodyIntoDocument: ({document, message, iframe}) ->
+
 module.exports = MessageViewExtension