diff --git a/wiki/app/views/wiki/_preview.rhtml b/wiki/app/views/wiki/_preview.rhtml
index 42f638a7e..c17200ab1 100644
--- a/wiki/app/views/wiki/_preview.rhtml
+++ b/wiki/app/views/wiki/_preview.rhtml
@@ -1,3 +1,3 @@
-<fieldset><legend><%= l(:label_preview) %></legend>
+<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
 <%= textilizable @text %>
 </fieldset>
diff --git a/wiki/app/views/wiki/edit.rhtml b/wiki/app/views/wiki/edit.rhtml
index 6dba85adb..ca29aa1e6 100644
--- a/wiki/app/views/wiki/edit.rhtml
+++ b/wiki/app/views/wiki/edit.rhtml
@@ -14,8 +14,10 @@
                          :method => 'get',
                          :update => 'preview',
                          :with => "Form.serialize('wiki_form')",
-                         :complete => visual_effect(:highlight, 'preview')
+                         :loading => "Element.show('indicator')",
+                         :loaded => "Element.hide('indicator')"
                        } %>
+   <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
 </p>
 
 <% end %>
diff --git a/wiki/public/images/draft.png b/wiki/public/images/draft.png
new file mode 100644
index 000000000..9eda38b54
Binary files /dev/null and b/wiki/public/images/draft.png differ
diff --git a/wiki/public/stylesheets/application.css b/wiki/public/stylesheets/application.css
index 05d0072bc..729609400 100644
--- a/wiki/public/stylesheets/application.css
+++ b/wiki/public/stylesheets/application.css
@@ -597,4 +597,6 @@ div.wiki table {
 div.wiki table, div.wiki td {
     border: 1px solid #bbb;
     padding: 4px;
-}
\ No newline at end of file
+}
+
+#preview .preview { background: #fafbfc url(../images/draft.png); }