diff --git a/lib/gollum/frontend/views/history.rb b/lib/gollum/frontend/views/history.rb
index d5b644ea..7720c0da 100644
--- a/lib/gollum/frontend/views/history.rb
+++ b/lib/gollum/frontend/views/history.rb
@@ -17,8 +17,8 @@ module Precious
             :id7      => v.id[0..6],
             :num      => i,
             :selected => @page.version.id == v.id,
-            :author   => v.author.name,
-            :message  => v.message,
+            :author   => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
+            :message  => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
             :date     => v.committed_date.strftime("%B %d, %Y"),
             :gravatar => Digest::MD5.hexdigest(v.author.email) }
         end
diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index 101de52f..84246a9d 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -15,7 +15,7 @@ module Precious
         page_versions = @page.versions
         first = page_versions ? page_versions.first : false
         return DEFAULT_AUTHOR unless first
-        first.author.name
+        first.author.name.respond_to?(:force_encoding) ? first.author.name.force_encoding('UTF-8') : first.author.name
       end
 
       def date