diff --git a/plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb b/plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb
index d336352..4e2308f 100644
--- a/plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb
+++ b/plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb
@@ -1,5 +1,10 @@
 class EnvironmentNotificationPluginAdminController < AdminController
+
+  helper EnvironmentNotificationHelper
+  include EnvironmentNotificationHelper
+
   before_filter :admin_required, :except => [:close_notification, :hide_notification]
+
   def index
     @notifications = environment.environment_notifications.order('updated_at DESC')
   end
diff --git a/plugins/environment_notification/controllers/public/environment_notification_plugin_public_controller.rb b/plugins/environment_notification/controllers/public/environment_notification_plugin_public_controller.rb
index 1bd4ca0..b801058 100644
--- a/plugins/environment_notification/controllers/public/environment_notification_plugin_public_controller.rb
+++ b/plugins/environment_notification/controllers/public/environment_notification_plugin_public_controller.rb
@@ -1,4 +1,7 @@
 class EnvironmentNotificationPluginPublicController < PublicController
+
+  helper EnvironmentNotificationHelper
+
   def notifications_with_popup
     @hide_notifications = hide_notifications
     if params[:previous_path]
@@ -7,4 +10,5 @@ class EnvironmentNotificationPluginPublicController < PublicController
       @previous_path = nil
     end
   end
+
 end
diff --git a/plugins/environment_notification/lib/environment_notification_helper.rb b/plugins/environment_notification/lib/environment_notification_helper.rb
index 47720ba..1933bd6 100644
--- a/plugins/environment_notification/lib/environment_notification_helper.rb
+++ b/plugins/environment_notification/lib/environment_notification_helper.rb
@@ -1,4 +1,12 @@
 module EnvironmentNotificationHelper
+
+  def hide_notifications
+    invalid_id = -1
+    hide_notifications_ids = [invalid_id]
+    hide_notifications_ids = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
+    hide_notifications_ids
+  end
+
   def self.substitute_variables(message, user)
     if user
       message = message.gsub("%{email}", user.person.email).gsub("%{name}", user.person.name)
@@ -6,4 +14,5 @@ module EnvironmentNotificationHelper
 
     message
   end
-end
\ No newline at end of file
+
+end
diff --git a/plugins/environment_notification/lib/environment_notification_plugin.rb b/plugins/environment_notification/lib/environment_notification_plugin.rb
index 2b94af1..2e92035 100644
--- a/plugins/environment_notification/lib/environment_notification_plugin.rb
+++ b/plugins/environment_notification/lib/environment_notification_plugin.rb
@@ -1,8 +1,5 @@
 class EnvironmentNotificationPlugin < Noosfero::Plugin
 
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::TagHelper
-
   def self.plugin_name
     "Environment Notifications Plugin"
   end
@@ -22,7 +19,10 @@ class EnvironmentNotificationPlugin < Noosfero::Plugin
   end
 
   def body_beginning
-    expanded_template('environment_notification_plugin_admin/show_notification.html.erb')
+    lambda do
+      extend EnvironmentNotificationHelper
+      render template: 'environment_notification_plugin_admin/show_notification'
+    end
   end
 
   def admin_panel_links
diff --git a/plugins/environment_notification/lib/ext/application_controller.rb b/plugins/environment_notification/lib/ext/application_controller.rb
deleted file mode 100644
index 19c7472..0000000
--- a/plugins/environment_notification/lib/ext/application_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_dependency 'application_controller'
-
-class ApplicationController
-  def hide_notifications
-    invalid_id = -1
-    hide_notifications_ids = [invalid_id]
-    hide_notifications_ids = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
-    hide_notifications_ids
-  end
-end
diff --git a/plugins/environment_notification/test/functional/account_controller_test.rb b/plugins/environment_notification/test/functional/account_controller_test.rb
index 43891fe..8eef307 100644
--- a/plugins/environment_notification/test/functional/account_controller_test.rb
+++ b/plugins/environment_notification/test/functional/account_controller_test.rb
@@ -1,7 +1,8 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
 require 'account_controller'
 
-class AccountController; def rescue_action(e) raise e end;
+class AccountController
+  include EnvironmentNotificationHelper
 end
 
 class AccountControllerTest < ActionController::TestCase
--
libgit2 0.21.2