diff --git a/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java
index beef5bc..fe0caf3 100644
--- a/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java
+++ b/src/com/silverwrist/venice/htmlcheck/filters/EmailRewriter.java
@@ -85,7 +85,7 @@ public class EmailRewriter implements Rewriter
     try
     { // compile our regular expression
       RECompiler compiler = new RECompiler();
-      s_match = compiler.compile("^[A-Za-z0-9!#$%*+-/=?^_`{|}~.]+@[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+$");
+      s_match = compiler.compile("^[A-Za-z0-9!#$%*+\\-/=?^_`{|}~\\.]+@[A-Za-z0-9_\\-]+(\\.[A-Za-z0-9_\\-]+)+$");
 
     } // end try
     catch (RESyntaxException e)
diff --git a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java
index 83bfe3a..0a6dcc8 100644
--- a/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java
+++ b/src/com/silverwrist/venice/htmlcheck/filters/EmoticonTagHandler.java
@@ -94,7 +94,7 @@ public class EmoticonTagHandler implements Rewriter
     RE r = null;
     try
     { // compile regular expression
-      r = new RE("ei:\\s*(\\w+)(?:\\s*/)?\\s*");
+      r = new RE("ei:\\s*(\\w+)(\\s*/)?\\s*");
 
     } // end try
     catch (RESyntaxException e)
diff --git a/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java b/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java
index 514e55f..739a3d3 100644
--- a/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java
+++ b/src/com/silverwrist/venice/htmlcheck/filters/URLRewriter.java
@@ -76,17 +76,17 @@ public class URLRewriter implements Rewriter
   private static final RECompiler COMPILER = new RECompiler();
   private static final String[] SETUP_DATA =
     {
-      "^http://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                                 "",
-      "^ftp://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                                  "",
-      "^gopher://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                               "",
-      "^mailto:[A-Za-z0-9!#$%*+-/=?^_`{|}~.]+@[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+$", "",
-      "^news:[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+$",                                  "",
-      "^nntp://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                                 "",
-      "^telnet://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                               "",
-      "^tn3270://[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)+",                               "",
-      "^www\\.[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)*",                                  "http://",
-      "^ftp\\.[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)*",                                  "ftp://",
-      "^gopher\\.[A-Za-z0-9_-]+(?:\\.[A-Za-z0-9_-]+)*",                               "gopher://"
+      "^http://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                                 "",
+      "^ftp://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                                  "",
+      "^gopher://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                               "",
+      "^mailto:[A-Za-z0-9!#$%*+-/=?^_`{|}~.]+@[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+$", "",
+      "^news:[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+$",                                  "",
+      "^nntp://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                                 "",
+      "^telnet://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                               "",
+      "^tn3270://[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+",                               "",
+      "^www\\.[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*",                                  "http://",
+      "^ftp\\.[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*",                                  "ftp://",
+      "^gopher\\.[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*",                               "gopher://"
     };
 
   private static final List KNOWN_ELEMENTS;
diff --git a/src/com/silverwrist/venice/ui/config/EmoticonManager.java b/src/com/silverwrist/venice/ui/config/EmoticonManager.java
index 5c0329c..67c9e1c 100644
--- a/src/com/silverwrist/venice/ui/config/EmoticonManager.java
+++ b/src/com/silverwrist/venice/ui/config/EmoticonManager.java
@@ -152,7 +152,7 @@ public class EmoticonManager
     RE r = null;
     try
     { // create the regexp
-      r = new RE("<ei:\\s*(\\w+)(?:\\s*/)?\\s*>");
+      r = new RE("<ei:\\s*(\\w+)(\\s*/)?\\s*>");
 
     } // end try
     catch (RESyntaxException e)