--- ConfigurableBrackedEnforcement.diff.old  2006-09-30 22:07:28.000000000 +0200
+++ ConfigurableBrackedEnforcement.diff      2006-09-30 22:02:33.000000000 +0200
@@ -150,7 +150,7 @@
 -            //Remove < and >
 -            recipient = recipient.substring(1, recipient.length() - 1);
 +            
-+            if (session.getConfigurationData().useAddressBracketsEnforcement()) {
++            if (session.getConfigurationData().useAddressBracketsEnforcement() || (recipient.startsWith("<") && recipient.endsWith(">"))) {
 +                //Remove < and >
 +                recipient = recipient.substring(1, recipient.length() - 1);
 +            }
@@ -179,7 +179,7 @@
 -            //Remove < and >
 -            sender = sender.substring(1, sender.length() - 1);
 +            
-+            if (session.getConfigurationData().useAddressBracketsEnforcement()) {
++            if (session.getConfigurationData().useAddressBracketsEnforcement() || (sender.startsWith("<") && sender.endsWith(">"))) {
 +                //Remove < and >
 +                sender = sender.substring(1, sender.length() - 1);
 +            }