Index: appserv-commons/src/java/com/sun/enterprise/deployment/MailConfiguration.java
===================================================================
RCS file: /cvs/glassfish/appserv-commons/src/java/com/sun/enterprise/deployment/MailConfiguration.java,v
retrieving revision 1.5
diff -r1.5 MailConfiguration.java
81,85c81,83
<     private static String PROP_NAME_PREFIX = "mail-";
<     private static String PROP_NAME_SUFFIX_HOST = "-host";
<     private static String PROP_NAME_SUFFIX_USER = "-user";
<     private static char PROP_NAME_DELIM = '-';
<     
---
>     private static String PROP_NAME_PREFIX_LEGACY = "mail-";
>     private static char PROP_NAME_DELIM_LEGACY = '-';
> 
230,233d227
<         String protRelatedHostPropName = PROP_NAME_PREFIX + storeProtocol +
<             PROP_NAME_SUFFIX_HOST;
<         String protRelatedUserPropName = PROP_NAME_PREFIX + storeProtocol +
<             PROP_NAME_SUFFIX_USER;
244,245c238,243
<             if (name.startsWith(PROP_NAME_PREFIX)) {
<                 if (name.equals(protRelatedHostPropName)) {
---
>             if(name.startsWith(PROP_NAME_PREFIX_LEGACY)) {
>                 name = name.replace(PROP_NAME_DELIM_LEGACY, MAIL_DELIM);
>             }
> 
>             if(name.startsWith(MAIL_PREFIX)) {
>                 if(name.equals(protRelatedHostName)) {
247,249c245
<                     mailProperties.put(protRelatedHostName, value);
<                 }
<                 else if (name.equals(protRelatedUserPropName)) {
---
>                 } else if(name.equals(protRelatedUserName)) {
251,255d246
<                     mailProperties.put(protRelatedUserName, value);
<                 }
<                 else {
<                     name = name.replace(PROP_NAME_DELIM, MAIL_DELIM);
<                     mailProperties.put(name, value);
256a248
>                 mailProperties.put(name, value);