diff --git a/plugins/send_email/lib/send_email_plugin.rb b/plugins/send_email/lib/send_email_plugin.rb
index 5d0bb08..4786b36 100644
--- a/plugins/send_email/lib/send_email_plugin.rb
+++ b/plugins/send_email/lib/send_email_plugin.rb
@@ -12,14 +12,13 @@ class SendEmailPlugin < Noosfero::Plugin
     true
   end
 
-  def parse_content(args)
-    raw_content = args[:html]
+  def parse_content(html, source)
     if context.profile
-      raw_content.gsub(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
+      html.gsub!(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
     else
-      raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver')
+      html.gsub!(/\{sendemail\}/, '/plugin/send_email/deliver')
     end
-    args.clone.merge({:html => raw_content})
+    [html, source]
   end
 
 end
diff --git a/plugins/send_email/test/unit/send_email_plugin_test.rb b/plugins/send_email/test/unit/send_email_plugin_test.rb
index bb58dde..875f427 100644
--- a/plugins/send_email/test/unit/send_email_plugin_test.rb
+++ b/plugins/send_email/test/unit/send_email_plugin_test.rb
@@ -18,12 +18,12 @@ class SendEmailPluginTest < ActiveSupport::TestCase
 
   should 'expand macro in parse_content event' do
     @plugin.context.stubs(:profile).returns(nil)
-    assert_match /plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}")
+    assert_match /plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}", nil).first
   end
 
   should 'expand macro in parse_content event on profile context' do
     @plugin.context.stubs(:profile).returns(fast_create(Community))
-    assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}")
+    assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}", nil).first
   end
 
 end
--
libgit2 0.21.2