diff --git a/plugins/send_email/controllers/send_email_plugin_controller.rb b/plugins/send_email/controllers/send_email_plugin_controller.rb
new file mode 100644
index 0000000..1a6cdf8
--- /dev/null
+++ b/plugins/send_email/controllers/send_email_plugin_controller.rb
@@ -0,0 +1,4 @@
+class SendEmailPluginController < ApplicationController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  include SendEmailPluginBaseController
+end
diff --git a/plugins/send_email/controllers/send_email_plugin_environment_controller.rb b/plugins/send_email/controllers/send_email_plugin_environment_controller.rb
deleted file mode 100644
index e5043e0..0000000
--- a/plugins/send_email/controllers/send_email_plugin_environment_controller.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class SendEmailPluginEnvironmentController < ApplicationController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  include SendEmailPluginBaseController
-end
diff --git a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
index 3297e26..70c4bba 100644
--- a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
+++ b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
@@ -59,7 +59,7 @@ class SendEmailPluginProfileControllerTest < ActionController::TestCase
   run_common_tests()
 end
 
-class SendEmailPluginEnvironmentControllerTest < ActionController::TestCase
+class SendEmailPluginControllerTest < ActionController::TestCase
   def setup
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
diff --git a/plugins/send_email/views/send_email_plugin/fail.rhtml b/plugins/send_email/views/send_email_plugin/fail.rhtml
new file mode 100644
index 0000000..ae357eb
--- /dev/null
+++ b/plugins/send_email/views/send_email_plugin/fail.rhtml
@@ -0,0 +1,3 @@
+<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
+
+<%= button :back, _('Back'), :back %>
diff --git a/plugins/send_email/views/send_email_plugin/success.rhtml b/plugins/send_email/views/send_email_plugin/success.rhtml
new file mode 100644
index 0000000..287e62f
--- /dev/null
+++ b/plugins/send_email/views/send_email_plugin/success.rhtml
@@ -0,0 +1,8 @@
+<h2><%= _('Message sent') %></h2>
+
+<table class='sendemail-plugin-message-sent'>
+  <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
+  <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
+</table>
+
+<p><%= button :back, _('Back'), :back %></p>
diff --git a/plugins/send_email/views/send_email_plugin_base/fail.rhtml b/plugins/send_email/views/send_email_plugin_base/fail.rhtml
deleted file mode 100644
index ae357eb..0000000
--- a/plugins/send_email/views/send_email_plugin_base/fail.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
-
-<%= button :back, _('Back'), :back %>
diff --git a/plugins/send_email/views/send_email_plugin_base/success.rhtml b/plugins/send_email/views/send_email_plugin_base/success.rhtml
deleted file mode 100644
index 287e62f..0000000
--- a/plugins/send_email/views/send_email_plugin_base/success.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<h2><%= _('Message sent') %></h2>
-
-<table class='sendemail-plugin-message-sent'>
-  <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
-  <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
-</table>
-
-<p><%= button :back, _('Back'), :back %></p>
diff --git a/plugins/send_email/views/send_email_plugin_environment b/plugins/send_email/views/send_email_plugin_environment
deleted file mode 120000
index 8ccfd60..0000000
--- a/plugins/send_email/views/send_email_plugin_environment
+++ /dev/null
@@ -1 +0,0 @@
-send_email_plugin_base
\ No newline at end of file
diff --git a/plugins/send_email/views/send_email_plugin_profile b/plugins/send_email/views/send_email_plugin_profile
index 8ccfd60..dbe16ad 120000
--- a/plugins/send_email/views/send_email_plugin_profile
+++ b/plugins/send_email/views/send_email_plugin_profile
@@ -1 +1 @@
-send_email_plugin_base
\ No newline at end of file
+send_email_plugin
\ No newline at end of file
--
libgit2 0.21.2