bin/sup-add in sup-0.21.0 vs bin/sup-add in sup-0.22.0

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
 require 'highline/import'
 require 'trollop'
 require "sup"
 
 $opts = Trollop::options do
@@ -93,10 +92,10 @@
     if !$opts[:force_new] && Redwood::SourceManager.source_for(uri)
       say "Already know about #{uri}; skipping."
       next
     end
 
-    parsed_uri = URI(uri)
+    parsed_uri = URI(URI.escape(uri))
 
     source =
       case parsed_uri.scheme
       when "maildir"
         Redwood::Maildir.new uri, !$opts[:unusual], $opts[:archive], $opts[:sync_back], nil, labels