diff --git a/extra/xapian_indexer.rb b/extra/xapian_indexer.rb
index d83d55f8..9a67b5d4 100644
--- a/extra/xapian_indexer.rb
+++ b/extra/xapian_indexer.rb
@@ -368,10 +368,10 @@ def add_or_update_index(databasepath, indexconf, project, repository, identifier
   uri = generate_uri(project, repository, identifier, path)
   return unless uri
   text = nil
-  if Redmine::MimeType.is_type?('text', path) #type eq 'txt' 
+  if Redmine::MimeType.is_type?('text', path) || (%(js msg eml).include?(type))
     text = repository.cat(path, identifier)
   else
-    fname = path.split( '/').last.tr(' ', '_')
+    fname = path.split('/').last.tr(' ', '_')
     bstr = nil
     bstr = repository.cat(path, identifier)
     File.open( "#{$tempdir}/#{fname}", 'wb+') do | bs |