diff --git a/Gemfile b/Gemfile
index ad45991dc..bc9a0ca9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,6 +77,9 @@ gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
 gem 'hoptoad_notifier'
 gem 'newrelic_rpm', :require => false
 
+#mail
+gem 'messagebus_ruby_api', '0.4.0'
+
 # tags
 
 gem 'acts-as-taggable-on', :git => 'git://github.com/diaspora/acts-as-taggable-on.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index b09c94341..499f186cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,6 +245,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    messagebus_ruby_api (0.4.0)
     mime-types (1.16)
     mini_magick (3.2)
       subexec (~> 0.0.4)
@@ -505,6 +506,7 @@ DEPENDENCIES
   json (= 1.4.6)
   jwt (= 0.1.3)
   linecache (= 0.43)
+  messagebus_ruby_api (= 0.4.0)
   mini_magick (= 3.2)
   mobile-fu
   mock_redis
diff --git a/config/application.yml.example b/config/application.yml.example
index 71902cad8..e8b619857 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -114,7 +114,7 @@ defaults: &defaults
   smtp_port: '587'
 
   # This chooses which mailer should be used. 'smtp' for a smtp
-  # connection or 'sendmail' to use the sendmail binary.
+  # connection or 'sendmail' to use the sendmail binary, or messagebus, to use the messagebus service
   mailer_method: 'smtp'
 
   # The path to the sendmail binary. Ignored if mailer_method is not set to sendmail
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 18345ee44..c4a352589 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,7 +1,6 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -17,6 +16,7 @@ Diaspora::Application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
   config.active_support.deprecation = :log
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 786a82557..c22d3815d 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -2,10 +2,18 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require File.join(Rails.root, 'lib/messagebus/mailer')
 Diaspora::Application.configure do
   config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].authority }
+
   unless Rails.env == 'test' || AppConfig[:mailer_on] != true
-    if AppConfig[:mailer_method] == "sendmail"
+    if AppConfig[:mailer_method] == 'messagebus'
+      if AppConfig[:messagebus_api_key].present?
+        config.action_mailer.delivery_method = Messagebus::Mailer.new(AppConfig[:messagebus_api_key])
+      else
+        puts "You need to set your messagebus api key if you are going to use the message bus service. no mailer is now configured"
+      end
+    elsif AppConfig[:mailer_method] == "sendmail"
       config.action_mailer.delivery_method = :sendmail
       config.action_mailer.sendmail_settings = {
         :location => AppConfig[:sendmail_location]
@@ -34,4 +42,5 @@ Diaspora::Application.configure do
       end
     end
   end
+
 end
diff --git a/lib/messagebus/mailer.rb b/lib/messagebus/mailer.rb
new file mode 100644
index 000000000..fab226332
--- /dev/null
+++ b/lib/messagebus/mailer.rb
@@ -0,0 +1,44 @@
+module Messagebus
+  class Mailer
+
+    def initialize(api_key)
+      @client = MessagebusRubyApi::Client.new(AppConfig[:messagebus_api_key])
+    end
+
+    attr_accessor :settings
+
+    def new(*settings)
+      self
+    end
+
+    def deliver!(message)
+      deliver(message)
+    end
+
+    private
+
+    def deliver(message)
+      # here we want  = {:fromEmail => message['from'].to_s}
+      @client.common_info = {:fromEmail => message.from.first}
+      message.to.each do |addressee|
+        m = {:toEmail => addressee, :subject => message.subject}
+
+        if message.multipart?
+          m[:plaintextBody] = message.text_part.body.to_s if message.text_part
+          m[:htmlBody]      = message.html_part.body.to_s if message.html_part
+        else
+          m[:plaintextBody] = message.body.to_s
+        end
+
+        @client.add_message(m)
+      end
+
+      status = @client.flush
+
+      if status[:failureCount] && status[:failureCount] > 0
+        raise "Messagebus failure.  failureCount=#{failureCount}, message=#{message.inspect}"
+      end
+
+    end
+  end
+end