diff --git a/Gemfile b/Gemfile
index 8f8c284a2..f65e92688 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,7 +126,6 @@ gem "rails-i18n",           "4.0.8"
 # Mail
 
 gem "markerb",             "1.1.0"
-gem "messagebus_ruby_api", "1.0.3"
 
 # Map
 gem "leaflet-rails",       "0.7.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index c35cd1098..0cb3b744d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -503,7 +503,6 @@ GEM
     markerb (1.1.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -966,7 +965,6 @@ DEPENDENCIES
   leaflet-rails (= 0.7.7)
   logging-rails (= 0.5.0)
   markerb (= 1.1.0)
-  messagebus_ruby_api (= 1.0.3)
   mini_magick (= 4.5.1)
   minitest
   mobile-fu (= 1.3.1)
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 5bf13e07d..57f92c799 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -574,8 +574,7 @@ configuration: ## Section
     #sender_address: 'no-reply@example.org'
 
     ## This selects which mailer should be used. Use 'smtp' for a smtp
-    ## connection, 'sendmail' to use the sendmail binary or
-    ## 'messagebus' to use the messagebus service.
+    ## connection or 'sendmail' to use the sendmail binary.
     #method: 'smtp'
 
     ## Ignore if method isn't 'smtp'.
@@ -618,9 +617,6 @@ configuration: ## Section
       ## Use exim and sendmail (default=false)
       #exim_fix: false
 
-    ## Ignore if method isn't 'messagebus'
-    #message_bus_api_key: 'abcdef'
-
   ## Administrator settings
   admins: ## Section
 
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index b09e26304..8cfb5e9b3 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -1,21 +1,12 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-require Rails.root.join('lib', 'messagebus', 'mailer')
 
 Diaspora::Application.configure do
   config.action_mailer.perform_deliveries = AppConfig.mail.enable?
 
   unless Rails.env == 'test' || !AppConfig.mail.enable?
-    if AppConfig.mail.method == 'messagebus'
-
-      if AppConfig.mail.message_bus_api_key.present?
-        config.action_mailer.delivery_method = Messagebus::Mailer.new(AppConfig.mail.message_bus_api_key.get)
-        config.action_mailer.raise_delivery_errors = true
-      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.mail.method == "sendmail"
+    if AppConfig.mail.method == "sendmail"
       config.action_mailer.delivery_method = :sendmail
       sendmail_settings = {
         location: AppConfig.mail.sendmail.location.get
diff --git a/lib/messagebus/mailer.rb b/lib/messagebus/mailer.rb
deleted file mode 100644
index 7593ab705..000000000
--- a/lib/messagebus/mailer.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Messagebus
-  class Mailer
-    def initialize(api_key)
-     @client = MessagebusApi::Messagebus.new(api_key)
-   end
-
-    attr_accessor :settings
-
-    def new(*settings)
-        self.settings = {}
-        self
-    end
-
-   def from_header_parse(string)
-     string.split('<')[0].delete('"')
-   end
-   
-   def deliver(message)
-     deliver!(message)
-   end
-
-   def deliver!(message)
-    msg = {:toEmail => message.to.first, :subject => message.subject, :fromEmail => AppConfig.mail.sender_address, :fromName => from_header_parse(message[:from].to_s)}
-
-    if message.multipart?
-      msg[:plaintextBody] = message.text_part.body.to_s if message.text_part
-      msg[:htmlBody] = message.html_part.body.to_s if message.html_part
-    else
-      msg[:plaintextBody] = message.body.to_s
-      msg[:htmlBody] = message.body.to_s
-    end
-
-    begin
-      @client.add_message(msg, true)
-    rescue => message_bus_api_error
-      raise "Messagebus API error=#{message_bus_api_error}, message=#{msg.inspect}"
-    end
-  end 
-end
-end