diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index b16f6107c..71612cb0d 100755
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -246,8 +246,6 @@ class ApiController(RedditController, OAuth2ResourceController):
             form.set_html(".status", _("your message has been delivered"))
             form.set_inputs(to = "", subject = "", text = "", captcha="")
 
-            amqp.add_item('new_message', m._fullname)
-
             queries.new_message(m, inbox_rel)
 
     @require_oauth2_scope("submit")
diff --git a/r2/r2/lib/db/queries.py b/r2/r2/lib/db/queries.py
index 2a1cbac0d..cd673f68e 100755
--- a/r2/r2/lib/db/queries.py
+++ b/r2/r2/lib/db/queries.py
@@ -986,6 +986,7 @@ def new_message(message, inbox_rels):
 
             set_unread(message, to, unread=True, mutator=m)
 
+    amqp.add_item('new_message', message._fullname)
     add_message(message)
 
 def set_unread(messages, to, unread, mutator=None):