diff --git a/app/views/comment/notifier/notification.html.erb b/app/views/comment/notifier/notification.html.erb
deleted file mode 100644
index 5fd6d71..0000000
--- a/app/views/comment/notifier/notification.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
-
-<%= word_wrap(_('Title: %s') % @comment_title) %>
-
-<%= _("Comment:") %>
--------------------------------------------------------------------------------
-<%= word_wrap(@comment_body) %>
--------------------------------------------------------------------------------
-
-<%= _('Access the address below to view this comment:') %>
-<%= url_for @comment_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
diff --git a/app/views/comment/notifier/notification.text.erb b/app/views/comment/notifier/notification.text.erb
new file mode 100644
index 0000000..5fd6d71
--- /dev/null
+++ b/app/views/comment/notifier/notification.text.erb
@@ -0,0 +1,19 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Access the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/pending_task_notifier/notification.html.erb b/app/views/pending_task_notifier/notification.html.erb
deleted file mode 100644
index 852e985..0000000
--- a/app/views/pending_task_notifier/notification.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= _("Dear %s") % @person.name %>,
-
-<%= _("You have %d pending task(s).") % @tasks.size %>
-
-<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= @url_for_pending_tasks %>
-<% @organizations_with_pending_tasks.each do |organization| %>
-<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
-<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
-
-<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
-
-<%= _("Click in address below to process task(s):") %>
-
-<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
-<% end %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/pending_task_notifier/notification.text.erb b/app/views/pending_task_notifier/notification.text.erb
new file mode 100644
index 0000000..852e985
--- /dev/null
+++ b/app/views/pending_task_notifier/notification.text.erb
@@ -0,0 +1,25 @@
+<%= _("Dear %s") % @person.name %>,
+
+<%= _("You have %d pending task(s).") % @tasks.size %>
+
+<%= @tasks.map{|i| " * #{i.description}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= @url_for_pending_tasks %>
+<% @organizations_with_pending_tasks.each do |organization| %>
+<% pending_tasks = @person.pending_tasks_for_organization(organization) %>
+<%= _("%s has %d pending task(s).") % [organization.name, pending_tasks.size] %>
+
+<%= pending_tasks.map{|i| " * #{i.information}"}.join("\n") %>
+
+<%= _("Click in address below to process task(s):") %>
+
+<%= url_for(:host => @default_hostname, :controller => 'tasks', :profile => organization.identifier) %>
+<% end %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/scrap/notifier/notification.html.erb b/app/views/scrap/notifier/notification.html.erb
deleted file mode 100644
index ec88a61..0000000
--- a/app/views/scrap/notifier/notification.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
-
--------------------------------------------------------------------------------
-<%= word_wrap(@scrap_content) %>
--------------------------------------------------------------------------------
-
-<%= _('View this scrap on the wall') %>:
-<%= url_for @wall_url %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
diff --git a/app/views/scrap/notifier/notification.text.erb b/app/views/scrap/notifier/notification.text.erb
new file mode 100644
index 0000000..ec88a61
--- /dev/null
+++ b/app/views/scrap/notifier/notification.text.erb
@@ -0,0 +1,16 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) has left the following scrap for you:') % { :sender => @sender, :sender_link => url_for(@sender_link) }) %>
+
+-------------------------------------------------------------------------------
+<%= word_wrap(@scrap_content) %>
+-------------------------------------------------------------------------------
+
+<%= _('View this scrap on the wall') %>:
+<%= url_for @wall_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/task_mailer/invitation_notification.html.erb b/app/views/task_mailer/invitation_notification.html.erb
deleted file mode 100644
index 17a3d7c..0000000
--- a/app/views/task_mailer/invitation_notification.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @message %>
\ No newline at end of file
diff --git a/app/views/task_mailer/invitation_notification.text.erb b/app/views/task_mailer/invitation_notification.text.erb
new file mode 100644
index 0000000..17a3d7c
--- /dev/null
+++ b/app/views/task_mailer/invitation_notification.text.erb
@@ -0,0 +1 @@
+<%= @message %>
\ No newline at end of file
diff --git a/app/views/task_mailer/target_notification.html.erb b/app/views/task_mailer/target_notification.html.erb
deleted file mode 100644
index b85dcd8..0000000
--- a/app/views/task_mailer/target_notification.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= _('Hello %s,') % @target %>
-
-<%= word_wrap(@message) %>
-
-<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
-<%= @tasks_url %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/task_mailer/target_notification.text.erb b/app/views/task_mailer/target_notification.text.erb
new file mode 100644
index 0000000..b85dcd8
--- /dev/null
+++ b/app/views/task_mailer/target_notification.text.erb
@@ -0,0 +1,10 @@
+<%= _('Hello %s,') % @target %>
+
+<%= word_wrap(@message) %>
+
+<%= word_wrap(_('Access your list of tasks or your control panel to see this and other pending actions that need your attention.')) %>
+<%= @tasks_url %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/task_mailer/task_activated.text.erb b/app/views/task_mailer/task_activated.text.erb
new file mode 120000
index 0000000..868d0e6
--- /dev/null
+++ b/app/views/task_mailer/task_activated.text.erb
@@ -0,0 +1 @@
+task_cancelled.text.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_activated.text.plain.html.erb b/app/views/task_mailer/task_activated.text.plain.html.erb
deleted file mode 120000
index e1c9e66..0000000
--- a/app/views/task_mailer/task_activated.text.plain.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_cancelled.text.erb b/app/views/task_mailer/task_cancelled.text.erb
new file mode 100644
index 0000000..9f74c43
--- /dev/null
+++ b/app/views/task_mailer/task_cancelled.text.erb
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/task_mailer/task_cancelled.text.plain.html.erb b/app/views/task_mailer/task_cancelled.text.plain.html.erb
deleted file mode 100644
index 9f74c43..0000000
--- a/app/views/task_mailer/task_cancelled.text.plain.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/task_mailer/task_created.text.erb b/app/views/task_mailer/task_created.text.erb
new file mode 120000
index 0000000..868d0e6
--- /dev/null
+++ b/app/views/task_mailer/task_created.text.erb
@@ -0,0 +1 @@
+task_cancelled.text.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_created.text.plain.html.erb b/app/views/task_mailer/task_created.text.plain.html.erb
deleted file mode 120000
index e1c9e66..0000000
--- a/app/views/task_mailer/task_created.text.plain.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_finished.text.erb b/app/views/task_mailer/task_finished.text.erb
new file mode 120000
index 0000000..868d0e6
--- /dev/null
+++ b/app/views/task_mailer/task_finished.text.erb
@@ -0,0 +1 @@
+task_cancelled.text.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_finished.text.plain.html.erb b/app/views/task_mailer/task_finished.text.plain.html.erb
deleted file mode 120000
index e1c9e66..0000000
--- a/app/views/task_mailer/task_finished.text.plain.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.plain.html.erb
\ No newline at end of file
diff --git a/app/views/user_mailer/activation_code.html.erb b/app/views/user_mailer/activation_code.html.erb
deleted file mode 100644
index efe9df7..0000000
--- a/app/views/user_mailer/activation_code.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
-
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
-
-<%= _("Greetings,") %>
-
---
-<%= _('%s team.') % @environment %>
-<%= url_for @url %>
diff --git a/app/views/user_mailer/activation_code.text.erb b/app/views/user_mailer/activation_code.text.erb
new file mode 100644
index 0000000..efe9df7
--- /dev/null
+++ b/app/views/user_mailer/activation_code.text.erb
@@ -0,0 +1,9 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
diff --git a/app/views/user_mailer/activation_email_notify.html.erb b/app/views/user_mailer/activation_email_notify.html.erb
deleted file mode 100644
index 07a60aa..0000000
--- a/app/views/user_mailer/activation_email_notify.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= _('Hello %s,') % @name  %>
-
-<%= _('Your email %s was just activated.') % [@email] %>
-
-<%= _('You can access your e-mail from anywhere, using the following address:') %>
-<%= @webmail %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/user_mailer/activation_email_notify.text.erb b/app/views/user_mailer/activation_email_notify.text.erb
new file mode 100644
index 0000000..07a60aa
--- /dev/null
+++ b/app/views/user_mailer/activation_email_notify.text.erb
@@ -0,0 +1,12 @@
+<%= _('Hello %s,') % @name  %>
+
+<%= _('Your email %s was just activated.') % [@email] %>
+
+<%= _('You can access your e-mail from anywhere, using the following address:') %>
+<%= @webmail %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
--
libgit2 0.21.2