diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 95cdff86f..c0626f387 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,4 +1,6 @@
 class Notifier < ActionMailer::Base
+  include Magent::Async
+  
   default :from => "no-reply@joindiaspora.com"
   ATTACHMENT =  File.read("#{Rails.root}/public/images/diaspora_caps.png")  
 
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 70c65c0ae..96144c910 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -72,7 +72,7 @@ module Diaspora
           activate_friend(friend_request.person, destination_aspect)
           Rails.logger.info("#{self.real_name}'s friend request has been accepted")
           friend_request.destroy
-          Notifier.request_accepted(self, friend_request.person, destination_aspect).deliver
+          Notifier.async.request_accepted(self, friend_request.person, destination_aspect).deliver.commit(1)
 
         #this is a new friend request
         elsif !from_me 
@@ -80,7 +80,7 @@ module Diaspora
           self.save
           Rails.logger.info("#{self.real_name} has received a friend request")
           friend_request.save
-          Notifier.new_request(self, friend_request.person).deliver
+          Notifier.async.new_request(self, friend_request.person).deliver.commit(1)
         else
           Rails.logger.info("unsolicited friend request: #{friend_request.to_json}")
         end
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index 8ca12ab21..ab774b9e4 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -65,7 +65,6 @@ describe MessageHandler do
   end
 
   describe 'POST messages' do
-
     it 'should be able to add a post message to the queue' do
       EventMachine.run {
         @handler.size.should ==0
@@ -103,6 +102,9 @@ describe MessageHandler do
   end
 
   describe "Hub publish" do
+    before do
+      EventMachine::PubSubHubbub.stub(:new).and_return(:success)
+    end
     it 'should correctly queue up a pubsubhubbub publish request' do
       destination = "http://identi.ca/hub/"
       feed_location = "http://google.com/"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4d529e1a2..3f6710bdc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -59,6 +59,10 @@ class FakeHttpRequest
     self 
   end
 
+  def publish(opts = nil)
+    self
+  end
+
   def callback(&b)
     b.call if @callback == :success
   end