diff --git a/lib/brakeman/checks/check_mail_to.rb b/lib/brakeman/checks/check_mail_to.rb
index 3b1d671aa6635294eb664ed61160a5a626090b97..efcb9dcc56081545e3b53c9e6ce75d251425cbb1 100644
--- a/lib/brakeman/checks/check_mail_to.rb
+++ b/lib/brakeman/checks/check_mail_to.rb
@@ -33,13 +33,10 @@ class Brakeman::CheckMailTo < Brakeman::BaseCheck
     Brakeman.debug "Checking calls to mail_to for javascript encoding"
 
     tracker.find_call(:target => false, :method => :mail_to).each do |result|
-      call = result[:call]
-      args = call.args
-
-      args.each do |arg|
+      result[:call].arglist.each do |arg|
         if hash? arg
-          if hash_access(arg, :javascript)
-            return result
+          if option = hash_access(arg, :encode)
+            return result if symbol? option and option.value == :javascript
           end
         end
       end