diff --git a/controllers/email_article_plugin_myprofile_controller.rb b/controllers/email_article_plugin_myprofile_controller.rb
index 30a015b..52d2a67 100644
--- a/controllers/email_article_plugin_myprofile_controller.rb
+++ b/controllers/email_article_plugin_myprofile_controller.rb
@@ -3,18 +3,6 @@ class EmailArticlePluginMyprofileController < MyProfileController
 
   needs_profile
 
-
-  # def send_email
-  #   if user.is_admin?(profile)
-  #     article = profile.articles.find(params[:id])
-  #     #EmailArticlePluginMyprofileController::Sender.content(article).deliver
-  #     Sender.content(article)
-  #     render :text => "Email sent to queue"
-  #   else
-  #     render :status => :forbidden, :text => "Forbidden user"
-  #   end
-  # end
-
   def send_email
     unless user.is_admin?(profile)
       render :status => :forbidden, :text => "Forbidden user"
@@ -36,398 +24,4 @@ class EmailArticlePluginMyprofileController < MyProfileController
     # end
   end
 
-  # before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
-  # before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
-  # before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
-  #
-  # helper TagsHelper
-  #
-  # protect 'send_mail_to_members', :profile, :only => [:send_mail]
-  #
-  # def index
-  #   @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
-  #   if logged_in? && current_person.follows?(@profile)
-  #     @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
-  #     @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
-  #   end
-  #   @tags = profile.article_tags
-  #   allow_access_to_page
-  # end
-  #
-  # def tags
-  #   @tags_cache_key = "tags_profile_#{profile.id.to_s}"
-  #   if is_cache_expired?(@tags_cache_key)
-  #     @tags = profile.article_tags
-  #   end
-  # end
-  #
-  # def content_tagged
-  #   @tag = params[:id]
-  #   @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
-  #   if is_cache_expired?(@tag_cache_key)
-  #     @tagged = profile.tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage])
-  #   end
-  # end
-  #
-  # def tag_feed
-  #   @tag = params[:id]
-  #   tagged = profile.articles.paginate(:per_page => 20, :page => 1, :order => 'published_at DESC', :include => :tags, :conditions => ['tags.name LIKE ?', @tag])
-  #   feed_writer = FeedWriter.new
-  #   data = feed_writer.write(
-  #     tagged,
-  #     :title => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
-  #     :description => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
-  #     :link => url_for(profile.url)
-  #   )
-  #   render :text => data, :content_type => "text/xml"
-  # end
-  #
-  # def communities
-  #   if is_cache_expired?(profile.communities_cache_key(params))
-  #     @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count)
-  #   end
-  # end
-  #
-  # def enterprises
-  #   @enterprises = profile.enterprises.includes(relations_to_include)
-  # end
-  #
-  # def friends
-  #   if is_cache_expired?(profile.friends_cache_key(params))
-  #     @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
-  #   end
-  # end
-  #
-  # def members
-  #   if is_cache_expired?(profile.members_cache_key(params))
-  #     @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
-  #   end
-  # end
-  #
-  # def fans
-  #   @fans = profile.fans.includes(relations_to_include)
-  # end
-  #
-  # def favorite_enterprises
-  #   @favorite_enterprises = profile.favorite_enterprises.includes(relations_to_include)
-  # end
-  #
-  # def sitemap
-  #   @articles = profile.top_level_articles.includes([:profile, :parent])
-  # end
-  #
-  # def join
-  #   if !user.memberships.include?(profile)
-  #     profile.add_member(user)
-  #     if !profile.members.include?(user)
-  #       render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
-  #     else
-  #       render :text => {:message => _('You just became a member of %s.') % profile.name}.to_json
-  #     end
-  #   else
-  #     render :text => {:message => _('You are already a member of %s.') % profile.name}.to_json
-  #   end
-  # end
-  #
-  # def join_not_logged
-  #   session[:join] = profile.identifier
-  #
-  #   if user
-  #     redirect_to :controller => 'profile', :action => 'join'
-  #   else
-  #     redirect_to :controller => '/account', :action => 'login'
-  #   end
-  # end
-  #
-  # def leave
-  #   if current_person.memberships.include?(profile)
-  #     if current_person.is_last_admin?(profile)
-  #       render :text => {:redirect_to => url_for({:controller => 'profile_members', :action => 'last_admin', :person => current_person.id})}.to_json
-  #     else
-  #       render :text => current_person.leave(profile, params[:reload])
-  #     end
-  #   else
-  #     render :text => {:message => _('You are not a member of %s.') % profile.name}.to_json
-  #   end
-  # end
-  #
-  # def check_membership
-  #   unless logged_in?
-  #     render :text => ''
-  #     return
-  #   end
-  #   if user.memberships.include?(profile)
-  #     render :text => 'true'
-  #   else
-  #     render :text => 'false'
-  #   end
-  # end
-  #
-  # def add
-  #   # FIXME this shouldn't be in Person model?
-  #   if !user.memberships.include?(profile)
-  #     AddFriend.create!(:person => user, :friend => profile)
-  #     render :text => _('%s still needs to accept being your friend.') % profile.name
-  #   else
-  #     render :text => _('You are already a friend of %s.') % profile.name
-  #   end
-  # end
-  #
-  # def check_friendship
-  #   unless logged_in?
-  #     render :text => ''
-  #     return
-  #   end
-  #   if user == profile || user.already_request_friendship?(profile) || user.is_a_friend?(profile)
-  #     render :text => 'true'
-  #   else
-  #     render :text => 'false'
-  #   end
-  # end
-  #
-  # def unblock
-  #   if current_user.person.is_admin?(profile.environment)
-  #     profile.unblock
-  #     session[:notice] = _("You have unblocked %s successfully. ") % profile.name
-  #     redirect_to :controller => 'profile', :action => 'index'
-  #   else
-  #     message = _('You are not allowed to unblock enterprises in this environment.')
-  #     render_access_denied(message)
-  #   end
-  # end
-  #
-  # def leave_scrap
-  #   sender = params[:sender_id].nil? ? current_user.person : Person.find(params[:sender_id])
-  #   receiver = params[:receiver_id].nil? ? @profile : Person.find(params[:receiver_id])
-  #   @scrap = Scrap.new(params[:scrap])
-  #   @scrap.sender= sender
-  #   @scrap.receiver= receiver
-  #   @tab_action = params[:tab_action]
-  #   @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
-  #   activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
-  #   render :partial => 'profile_activities_list', :locals => {:activities => activities}
-  # end
-  #
-  # def leave_comment_on_activity
-  #   @comment = Comment.new(params[:comment])
-  #   @comment.author = user
-  #   @activity = ActionTracker::Record.find(params[:source_id])
-  #   @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
-  #   @tab_action = params[:tab_action]
-  #   @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
-  #   if @tab_action == 'wall'
-  #     activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
-  #     render :partial => 'profile_activities_list', :locals => {:activities => activities}
-  #   else
-  #     network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
-  #     render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
-  #   end
-  # end
-  #
-  # def view_more_activities
-  #   @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
-  #   render :partial => 'profile_activities_list', :locals => {:activities => @activities}
-  # end
-  #
-  # def view_more_network_activities
-  #   @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
-  #   render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
-  # end
-  #
-  # def more_comments
-  #   profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile}
-  #   activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity]}.merge(profile_filter))
-  #   comments_count = activity.comments.count
-  #   comment_page = (params[:comment_page] || 1).to_i
-  #   comments_per_page = 5
-  #   no_more_pages = comments_count <= comment_page * comments_per_page
-  #
-  #   render :update do |page|
-  #     page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
-  #       :partial => 'comment', :collection => activity.comments.flatten.paginate(:per_page => comments_per_page, :page => comment_page)
-  #
-  #     if no_more_pages
-  #       page.remove 'profile-wall-activities-comments-more-'+params[:activity]
-  #     else
-  #       page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
-  #         :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
-  #     end
-  #   end
-  # end
-  #
-  # def more_replies
-  #   activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
-  #   comments_count = activity.replies.count
-  #   comment_page = (params[:comment_page] || 1).to_i
-  #   comments_per_page = 5
-  #   no_more_pages = comments_count <= comment_page * comments_per_page
-  #
-  #   render :update do |page|
-  #     page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
-  #       :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
-  #
-  #     if no_more_pages
-  #       page.remove 'profile-wall-activities-comments-more-'+params[:activity]
-  #     else
-  #       page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
-  #         :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
-  #     end
-  #   end
-  # end
-  #
-  # def remove_scrap
-  #   begin
-  #     scrap = current_user.person.scraps(params[:scrap_id])
-  #     scrap.destroy
-  #     finish_successful_removal 'Scrap successfully removed.'
-  #   rescue
-  #     finish_unsuccessful_removal 'You could not remove this scrap.'
-  #   end
-  # end
-  #
-  # def remove_activity
-  #   begin
-  #     raise if !can_edit_profile
-  #     activity = ActionTracker::Record.find(params[:activity_id])
-  #     if params[:only_hide]
-  #       activity.update_attribute(:visible, false)
-  #     else
-  #       activity.destroy
-  #     end
-  #     finish_successful_removal 'Activity successfully removed.'
-  #   rescue
-  #     finish_unsuccessful_removal 'You could not remove this activity.'
-  #   end
-  # end
-  #
-  # def remove_notification
-  #   begin
-  #     raise if !can_edit_profile
-  #     notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
-  #     notification.destroy
-  #     render :text => _('Notification successfully removed.')
-  #   rescue
-  #     render :text => _('You could not remove this notification.')
-  #   end
-  # end
-  #
-  # def finish_successful_removal(msg)
-  #   if request.xhr?
-  #     render :text => {'ok' => true}.to_json, :content_type => 'application/json'
-  #   else
-  #     session[:notice] = _(msg)
-  #     redirect_to :action => :index
-  #   end
-  # end
-  #
-  # def finish_unsuccessful_removal(msg)
-  #   session[:notice] = _(msg)
-  #   if request.xhr?
-  #     render :text => {'redirect' => url_for(:action => :index)}.to_json, :content_type => 'application/json'
-  #   else
-  #     redirect_to :action => :index
-  #   end
-  # end
-  #
-  # def report_abuse
-  #   @abuse_report = AbuseReport.new
-  #   render :layout => false
-  # end
-  #
-  # def register_report
-  #   unless user.is_admin? || verify_recaptcha
-  #     render :text => {
-  #       :ok => false,
-  #       :error => {
-  #         :code => 1,
-  #         :message => _('You could not answer the captcha.')
-  #       }
-  #     }.to_json
-  #   else
-  #     begin
-  #       abuse_report = AbuseReport.new(params[:abuse_report])
-  #       if !params[:content_type].blank?
-  #         article = params[:content_type].constantize.find(params[:content_id])
-  #         abuse_report.content = article_reported_version(article)
-  #       end
-  #
-  #       user.register_report(abuse_report, profile)
-  #
-  #       if !params[:content_type].blank?
-  #         abuse_report = AbuseReport.find_by_reporter_id_and_abuse_complaint_id(user.id, profile.opened_abuse_complaint.id)
-  #         Delayed::Job.enqueue DownloadReportedImagesJob.new(abuse_report, article)
-  #       end
-  #
-  #       render :text => {
-  #         :ok => true,
-  #         :message => _('Your abuse report was registered. The administrators are reviewing your report.'),
-  #       }.to_json
-  #     rescue Exception => exception
-  #       logger.error(exception.to_s)
-  #       render :text => {
-  #         :ok => false,
-  #         :error => {
-  #           :code => 2,
-  #           :message => _('Your report couldn\'t be saved due to some problem. Please contact the administrator.')
-  #         }
-  #       }.to_json
-  #     end
-  #   end
-  # end
-  #
-  # def remove_comment
-  #   #FIXME Check whether these permissions are enough
-  #   @comment = Comment.find(params[:comment_id])
-  #   if (user == @comment.author || user == profile || user.has_permission?(:moderate_comments, profile))
-  #     @comment.destroy
-  #     finish_successful_removal 'Comment successfully removed.'
-  #   else
-  #     finish_unsuccessful_removal 'You could not remove this comment.'
-  #   end
-  # end
-
-
-
-
-  # protected
-  #
-  # def check_access_to_profile
-  #   unless profile.display_info_to?(user)
-  #     redirect_to :action => 'index'
-  #   end
-  # end
-  #
-  # def store_location
-  #   if session[:previous_location].nil?
-  #     session[:previous_location] = request.referer
-  #   end
-  # end
-  #
-  # def redirect_to_previous_location
-  #   back = session[:previous_location]
-  #   if back
-  #     session[:previous_location] = nil
-  #     redirect_to back
-  #   else
-  #     redirect_to profile.url
-  #   end
-  # end
-  #
-  # def per_page
-  #   Noosfero::Constants::PROFILE_PER_PAGE
-  # end
-  #
-  # def members_per_page
-  #   20
-  # end
-  #
-  # def can_edit_profile
-  #   @can_edit_profile ||= user && user.has_permission?('edit_profile', profile)
-  # end
-  # helper_method :can_edit_profile
-  #
-  # def relations_to_include
-  #   [:image, :domains, :preferred_domain, :environment]
-  # end
-
 end
diff --git a/controllers/email_article_plugin_myprofile_controller_old.rb b/controllers/email_article_plugin_myprofile_controller_old.rb
deleted file mode 100644
index 4b8f706..0000000
--- a/controllers/email_article_plugin_myprofile_controller_old.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'nokogiri'
-
-class EmailArticlePluginMyprofileController < MyProfileController
-
-  needs_profile
-
-  def send_email
-    if user.is_admin?(profile)
-      article = profile.articles.find(params[:id])
-      #EmailArticlePluginMyprofileController::Sender.content(article).deliver
-      Sender.content(article)
-      render :text => "Email sent to queue"
-    else
-      render :status => :forbidden, :text => "Forbidden user"
-    end
-  end
-
-  class Sender
-    def self.content(article)
-      source = article.author.user.person
-      mail = Mailing.new
-      mail.
-      #  mailing = create(Mailing, :source => article.author.user.person, :subject => 'Hello', :body => 'We have some news', :person => article.author.user.person)
-    end
-
-    def absolute_url? url
-      url.start_with?('http') || url.start_with?('ftp')
-    end
-  end
-
-
-  class Sender < ActionMailer::Base
-    def content(article)
-      doc = Nokogiri::HTML(article.body)
-      doc.css("a").each do |link|
-        if !link.attribute("href").nil? and !absolute_url?(link.attribute("href").value)
-          relative_path = link.attribute("href").value
-          if relative_path.starts_with?('/')
-            relative_path[0]=''
-          end
-          link.attribute("href").value = "http://#{article.environment.default_hostname}/#{relative_path}"
-        end
-      end
-
-      doc.css("img").each do |link|
-        unless link.attribute("src").nil? and absolute_url?(link.attribute("src").value)
-          relative_path = link.attribute("src").value
-          link.attribute("src").value = "http://#{article.environment.default_hostname}/#{relative_path}"
-        end
-      end
-
-#        link.attributes["href"].value = "http://myproxy.com/?url=#{CGI.escape link.attributes["href"].value}"
-#        http://#{environment.default_hostname}/#{relative_path[1]}
-
-
-      body = doc.to_html
-      sender = Person.find(article.author_id)
-      members = article.profile.members
-      emails = []
-      members.each{ |m|
-        emails.push(m.user.email)
-      }
-
-    #  mailing = create(Mailing, :source => article.author.user.person, :subject => 'Hello', :body => 'We have some news', :person => article.author.user.person)
-
-      mail(
-        content_type: 'text/html',
-        to: emails,
-        from: "#{article.author_name} <#{sender.contact_email}>",
-        reply_to: article.author.user.email,
-        subject: "[Artigo] " + article.title,
-        body: body
-#        body: set_absolute_path(article.body, article.environment)
-      )
-    end
-end
-
-
-
-end
diff --git a/lib/email_article_plugin.rb b/lib/email_article_plugin.rb
index f49fb66..a483d5a 100644
--- a/lib/email_article_plugin.rb
+++ b/lib/email_article_plugin.rb
@@ -8,25 +8,13 @@ class EmailArticlePlugin < Noosfero::Plugin
     _("A plugin that emails an article to the members of the community")
   end
 
-  def article_toolbar_extra_buttons
-    label = _("Send article to members")
-    htmlclass = _("button with-text icon-menu-mail")
-    title = _("Email article to all community members")
-    proc do
-      if  !profile.blank? and !user.blank? and user.is_admin?(profile) and @page.kind_of?(TextArticle)
-        link_to_remote(
-            label,
-            {
-               :url => { :profile => profile.identifier, :controller => 'email_article_plugin_myprofile', :action => "send_email", :id => @page},
-               :method => :get,
-               :success => "display_notice('" + _("Messages are being sent") + "')",
-               :failure => "display_notice('" + _("Error sending emails") + "')",
-               :confirm => _("Are you sure you want to email this article to all community members?"),
-            },
-            :class => htmlclass,
-            :title => title
-         )
-      end
-    end
+  def article_extra_toolbar_buttons(article)
+#raise current_person.identifier.inspect + "  " + profile.identifier.inspect + ' ' + current_person.is_admin?.inspect + " " + article.kind_of?(TextArticle).inspect + " " + profile.admins.include?(current_person).inspect
+    return [] if !(profile.admins.include?(current_person) || current_person.is_admin?) || !article.kind_of?(TextArticle)
+    {
+      :icon => 'icon-menu-mail',
+      :url => { :profile => profile.identifier, :controller => 'email_article_plugin_myprofile', :action => "send_email", :id => article},
+      :title => _("Send article to members")
+    }
   end
 end
diff --git a/test/functional/email_article_plugin_myprofile_controller_test.rb b/test/functional/email_article_plugin_myprofile_controller_test.rb
index 6ebb4d7..d4dcd99 100644
--- a/test/functional/email_article_plugin_myprofile_controller_test.rb
+++ b/test/functional/email_article_plugin_myprofile_controller_test.rb
@@ -32,7 +32,7 @@ class EmailArticlePluginMyprofileControllerTest < ActionController::TestCase
     assert_response 403
   end
 
-  should 'show button at article_toolbar_extra_buttons' do
+  should 'show button at article_extra_toolbar_buttons' do
     @profile = Community.create!(:name => 'Another community', :identifier => 'another-community')
     @user = create_user('user-out-of-the-community')
     login_as(@user.login)
@@ -43,7 +43,7 @@ class EmailArticlePluginMyprofileControllerTest < ActionController::TestCase
     @article.save
     @plugin = EmailArticlePlugin.new
     @plugin.stubs(:link_to_remote).returns(true)
-    send_mail_button = @plugin.article_toolbar_extra_buttons
+    send_mail_button = @plugin.article_extra_toolbar_buttons(@article)
     self.stubs(:profile).returns(@profile)
     self.stubs(:user).returns(@user)
 #    self.stubs(:page).returns(@article)
diff --git a/test/unit/email_article_plugin_test.rb b/test/unit/email_article_plugin_test.rb
index c157f25..3858478 100644
--- a/test/unit/email_article_plugin_test.rb
+++ b/test/unit/email_article_plugin_test.rb
@@ -3,9 +3,17 @@ require File.dirname(__FILE__) + '/../test_helper'
 class EmailArticlePluginTest < ActiveSupport::TestCase
 
   def setup
-    @plugin = EmailArticlePlugin.new
+    @environment = Environment.default
+    @user = create_user('testuser').person
+    @profile = fast_create(Profile)
+    context = mock()
+    context.stubs(:current_person).returns(@user)
+    context.stubs(:profile).returns(@profile)
+    @plugin = EmailArticlePlugin.new(context)
   end
 
+  attr_accessor :plugin, :profile, :user, :environment
+
   should 'be a noosfero plugin' do
     assert_kind_of Noosfero::Plugin, @plugin
   end
@@ -18,4 +26,70 @@ class EmailArticlePluginTest < ActiveSupport::TestCase
     assert_equal  _("A plugin that emails an article to the members of the community"), EmailArticlePlugin.plugin_description
   end
 
+  should 'display button to send email for all members of a community if the user is a community admin' do
+    profile.add_admin(user)
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_not_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'display button to send email for all members of a community if the user is an environment administrator' do
+#    profile.add_admin(user)
+    environment.add_admin(user)
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_not_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'the title be Send article to members' do
+    profile.add_admin(user)
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_equal 'Send article to members', plugin.article_extra_toolbar_buttons(article)[:title]
+  end
+
+  should 'the icon be icon-menu-mail' do
+    profile.add_admin(user)
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_equal 'icon-menu-mail', plugin.article_extra_toolbar_buttons(article)[:icon]
+  end
+
+  should 'not display button to send email for members if the user is not a community admin' do
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'not display button to send email for members if the article is a Blog' do
+    profile.add_admin(user)
+    article = fast_create(Blog, :profile_id => profile.id)
+    assert_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'not display button to send email for members if the article is a Folder' do
+    profile.add_admin(user)
+    article = fast_create(Folder, :profile_id => profile.id)
+    assert_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'not display button to send email for members if the article is a UploadedFile' do
+    profile.add_admin(user)
+    article = fast_create(UploadedFile, :profile_id => profile.id)
+    assert_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'display button to send email for members if the article is a TextArticle' do
+    profile.add_admin(user)
+    article = fast_create(TextArticle, :profile_id => profile.id)
+    assert_not_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'display button to send email for members if the article is a TextileArticle' do
+    profile.add_admin(user)
+    article = fast_create(TextileArticle, :profile_id => profile.id)
+    assert_not_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
+  should 'display button to send email for members if the article is a TinyMceArticle' do
+    profile.add_admin(user)
+    article = fast_create(TinyMceArticle, :profile_id => profile.id)
+    assert_not_equal [], plugin.article_extra_toolbar_buttons(article)
+  end
+
 end
diff --git a/test/unit/test_email_article_article_mailer.rb b/test/unit/test_email_article_article_mailer.rb
deleted file mode 100644
index c157f25..0000000
--- a/test/unit/test_email_article_article_mailer.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class EmailArticlePluginTest < ActiveSupport::TestCase
-
-  def setup
-    @plugin = EmailArticlePlugin.new
-  end
-
-  should 'be a noosfero plugin' do
-    assert_kind_of Noosfero::Plugin, @plugin
-  end
-
-  should 'have name' do
-    assert_equal 'Email Article to Community Members Plugin', EmailArticlePlugin.plugin_name
-  end
-
-  should 'have description' do
-    assert_equal  _("A plugin that emails an article to the members of the community"), EmailArticlePlugin.plugin_description
-  end
-
-end
diff --git a/test/unit/test_email_article_plugin_article_mailer.rb b/test/unit/test_email_article_plugin_article_mailer.rb
index 0bdccfd..2225937 100644
--- a/test/unit/test_email_article_plugin_article_mailer.rb
+++ b/test/unit/test_email_article_plugin_article_mailer.rb
@@ -69,13 +69,6 @@ class EmailArticlePluginArticleMailerTest < ActiveSupport::TestCase
     assert_equal "#{community.environment.top_url}/#{community.name.to_slug}/", mailing.url
   end
 
-  should 'deliver mailing to each member after create' do
-    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
-    community.reload
-    process_delayed_job_queue
-    assert_equal 2, ActionMailer::Base.deliveries.count
-  end
-
   should 'deliver mailing when there are many mailings created' do
     50.times { create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
     community.reload
--
libgit2 0.21.2