diff --git a/bin/untranslated_erb b/bin/untranslated_erb
index 850586925..d341443f9 100755
--- a/bin/untranslated_erb
+++ b/bin/untranslated_erb
@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+require 'rails-html-sanitizer'
+
 class I18nExtractor
   ERB_TAG = /<%(.*?)%>/
-  HTML_TAG = /<(.*?)>/
+  HTML_TAG = /<[^>]*>|<\/[^>]*>|[^>]*\/>|\".+">|">|<\w+(.+|)|.+="(.+)|"/
   SEPERATOR = '_@@@_'
   SKIP_TAGS = [[/<script/i,/<\/script>/i],[/<%/,/%>/],[/<style/i,/\/style>/i]]
 
@@ -12,23 +14,25 @@ class I18nExtractor
   end
 
   def extract
-    File.open(@filename).each_with_index do |line,i|
+    sanitizer = Rails::Html::FullSanitizer.new
+    i = 0
+    File.foreach(@filename) do |line|
+      i += 1
       next if in_script_block?(line)
-      text = line.gsub(ERB_TAG, SEPERATOR).gsub(HTML_TAG,SEPERATOR).strip
-      arr = text.split SEPERATOR
-      arr.each do |e|
-        if e.strip.size > 1
-          unless @files_with_results.include?(@filename)
-            @files_with_results << @filename
-            printf "\n\n\e[4m#{@filename}\e[00m\n\n"
-          end
-          printf("%3s:%s\n",i+1,e.strip)
+      striped_line = sanitizer.sanitize(line).chomp.strip.gsub(HTML_TAG, '')
+      next if striped_line.empty?
+      if striped_line.length > 1
+        unless @files_with_results.include?(@filename)
+          @files_with_results << @filename
+          printf "\n\n\e[4m#{@filename}\e[00m\n"
         end
+        printf("%3s:%s\n",i+1,striped_line)
       end
     end
   end
 
-private
+  private
+
   def in_script_block?(s)
     return true if s.nil? || s.strip.size == 0 
     jump_in_tag = SKIP_TAGS.find{ |start_tag,end_tag| s =~ start_tag}