Refactor Email Functionality

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java

@@ -268,7 +268,7 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
                     emailMessageProperties.getSubject() + "'", e);
         }
         emailMessageProperties.setMessageBody(messageBuilder.toString());
-        emailMessageProperties.setSubject(EmailConstants.EnrolmentEmailConstants.ENROLMENT_MAIL_SUBJECT);
+        emailMessageProperties.setSubject(enrolmentNotifications.getSubject());
         EmailServiceDataHolder.getInstance().getEmailServiceProvider().sendEmail(emailMessageProperties);
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/email/EmailConstants.java

@@ -24,7 +24,6 @@ public final class EmailConstants {
         public static final String USERNAME = "user-name";
         public static final String DOwN_LOAD_URL = "downloadUrl";
         public static final String ENCODED_SCHEME = "UTF-8";
-        public static final String ENROLMENT_MAIL_SUBJECT = "Enrol Your Device with wso2 MDM";
     }
 
 }

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml

@@ -27,6 +27,6 @@ Best Regards,
 WSO2 Carbon Team
 http://www.wso2.com
             </Footer>
-            <Subject>Enrol your device</Subject>
+            <Subject>Enrol your device with WSO2 MDM</Subject>
     </EnrolmentNotifications>
 </Notifications>