1 files changed, 2 insertions, 2 deletions
diff --git a/dwim b/dwim
index 9e000aa..b646de6 100755
--- a/dwim
+++ b/dwim
@@ -22,12 +22,12 @@ my $MAILROOT       = env MAILROOT => "/home/john/mail/";
 our $handler;
 
 for ($phrase) {
-	if (/^(https?:\/?\/?.+)$/) {
+	if (/^(https?:\/?\/?[^\s]+)$/) {
 		handle "web address";
 		run @BROWSER, "$1"
 	}
 
-	if (/^(mailto:.+)$/ or /^(.+@.+\.\w+)$/) {
+	if (/^(mailto:[^\s]+)$/ or /^([^\s]+@.+\.\w+)$/) {
 		handle "e-mail address";
 		run @MAILER, "$1"
 	}