diff --git a/app/views/wiki/_content.html.erb b/app/views/wiki/_content.html.erb
index 60b6a7452..fcfcc1351 100644
--- a/app/views/wiki/_content.html.erb
+++ b/app/views/wiki/_content.html.erb
@@ -1,4 +1,5 @@
 <div class="wiki wiki-page">
   <%= textilizable content, :text, :attachments => content.page.attachments,
         :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
+  <%#= content.text.html_safe  %>
 </div>
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 85b964a9b..35f905eef 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -1,5 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
+<script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
 <h3><%= h @page.pretty_title %></h3>
 
 <%= form_for @content, :as => :content,
@@ -12,8 +13,15 @@
 <% end %>
 <%= error_messages_for 'content' %>
 
+    <div class="actions" style="max-width:680px">
+      <p style="max-width:680px;"><%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %></p>
+      <script type="text/javascript">
+          var ckeditor=CKEDITOR.replace('editor02');
+      </script>
+    </div>
+
 <div class="box tabular">
-<%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
+<%#= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
                   :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
 
   <!--p style="max-width:680px"><input id="editor02" required="true" /><%#= f.text_area :comments, :required => true, :id => 'editor02' %></p>
@@ -31,7 +39,7 @@
   <% end %>
 <% end %>
 
-<p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
+<p style="width: 100%;"><label><%= l(:field_comments) %></label><%= f.text_field :comments, :style => "width:75%;" %></p>
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>