diff --git a/lib/spreewald/email_steps.rb b/lib/spreewald/email_steps.rb
index <HASH>..<HASH> 100644
--- a/lib/spreewald/email_steps.rb
+++ b/lib/spreewald/email_steps.rb
@@ -60,7 +60,7 @@ end
 When /^I follow the (first|second|third)? ?link in the e?mail$/ do |index_in_words|
   mail = @mail || ActionMailer::Base.deliveries.last
   index = { nil => 0, 'first' => 0, 'second' => 1, 'third' => 2 }[index_in_words]
-  url_pattern = %r{(?:http|https)://[^/]+([^"']*)}
+  url_pattern = %r{(?:http|https)://[^/]+([^"'\s]*)}
   mail_body = MailFinder.email_text_body(mail).to_s
   only_path = mail_body.scan(url_pattern)[index][0]
   visit only_path
diff --git a/lib/spreewald_support/version.rb b/lib/spreewald_support/version.rb
index <HASH>..<HASH> 100644
--- a/lib/spreewald_support/version.rb
+++ b/lib/spreewald_support/version.rb
@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module Spreewald
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end
fix email step for non-html emails