diff --git a/app/views/contact/new.rhtml b/app/views/contact/new.rhtml
index 29cfe4c..0bcc195 100644
--- a/app/views/contact/new.rhtml
+++ b/app/views/contact/new.rhtml
@@ -18,8 +18,11 @@
   <% unless environment.enabled?('disable_select_city_for_contact') || location_fields.blank? %>
     <%= labelled_form_field _('City and state'), location_fields %>
   <% end %>
-  <%= required f.text_field(:subject) %>
-  <%= required f.text_area(:message, :rows => 10, :cols => 60) %>
+  <%= f.text_field :subject %>
+
+  <%= render :file => 'shared/tiny_mce' %>
+  <%= f.text_area :message, :class => 'mceEditor' %>
+
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
 
   <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
diff --git a/app/views/profile/send_mail.rhtml b/app/views/profile/send_mail.rhtml
index 185f7cd..fe2ea1d 100644
--- a/app/views/profile/send_mail.rhtml
+++ b/app/views/profile/send_mail.rhtml
@@ -4,11 +4,13 @@
 
 <%= error_messages_for :mailing %>
 
-<%= render :file => 'shared/tiny_mce' %>
-
 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
+
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
+
+  <%= render :file => 'shared/tiny_mce' %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :back %>
 <% end %>
--
libgit2 0.21.2