diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index a2186d7c..3e95f150 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -1771,7 +1771,9 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
         if (this.draft_manager != null) {
             Geary.ComposedEmail draft = yield get_composed_email(null, true);
             yield this.draft_manager.update(
-                yield draft.to_rfc822_message(null, null),
+                yield new Geary.RFC822.Message.from_composed_email(
+                    draft, null, null
+                ),
                 null,
                 null
             );
diff --git a/src/engine/api/geary-composed-email.vala b/src/engine/api/geary-composed-email.vala
index 72f30ba8..5c3e27d8 100644
--- a/src/engine/api/geary-composed-email.vala
+++ b/src/engine/api/geary-composed-email.vala
@@ -123,13 +123,6 @@ public class Geary.ComposedEmail : EmailHeaderSet, BaseObject {
         return this;
     }
 
-    public async Geary.RFC822.Message to_rfc822_message(string? message_id,
-                                                        GLib.Cancellable? cancellable) {
-        return yield new RFC822.Message.from_composed_email(
-            this, message_id, cancellable
-        );
-    }
-
     /**
      * Determines if an IMG SRC value is present in the HTML part.
      *