diff --git a/lib/mail_jack/interceptor.rb b/lib/mail_jack/interceptor.rb
index <HASH>..<HASH> 100644
--- a/lib/mail_jack/interceptor.rb
+++ b/lib/mail_jack/interceptor.rb
@@ -7,6 +7,9 @@ module MailJack
       hrefs = hrefs.uniq
 
       querystr = MailJack.trackables.keys.inject({}) {|hash, a| hash[a] = message.send(a); hash}.to_query
+      if MailJack.config.enable_encoding?
+        querystr = "#{MailJack.config.encode_to}=#{Base64.encode64(querystr)}"
+      end
       hrefs.each do |h| 
         q = "?#{querystr}" unless h.include?("?")
         body.gsub!(h, "#{h}#{q}")
diff --git a/lib/mail_jack/version.rb b/lib/mail_jack/version.rb
index <HASH>..<HASH> 100644
--- a/lib/mail_jack/version.rb
+++ b/lib/mail_jack/version.rb
@@ -1,4 +1,4 @@
 module MailJack
   # The version of the gem
-  VERSION = '0.2.1'.freeze unless defined?(::MailJack::VERSION)
+  VERSION = '0.2.2'.freeze unless defined?(::MailJack::VERSION)
 end
fixed issue with not encoding params