diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java
index 1d44db2ad..b647d1c0d 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java
@@ -57,6 +57,7 @@ public enum PredefinedConnectors {
             ConnectorProperty.create(PredefinedConnectorProperties.PROTOCOL, ""),
             ConnectorProperty.create(PredefinedConnectorProperties.HOST, ""),
             ConnectorProperty.create(PredefinedConnectorProperties.PORT, ""),
+            ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_SENDER, ""),
             ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_USERNAME, ""),
             ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_PASSWORD, "")
 
diff --git a/libreplan-business/src/main/java/org/libreplan/business/email/daos/EmailTemplateDAO.java b/libreplan-business/src/main/java/org/libreplan/business/email/daos/EmailTemplateDAO.java
index df4751ff5..bae685a2a 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/email/daos/EmailTemplateDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/email/daos/EmailTemplateDAO.java
@@ -59,7 +59,7 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
             List<EmailTemplate> emailTemplates = list(EmailTemplate.class);
             for ( int i = 0; i < emailTemplates.size(); i++)
                 // language.ordinal.equals(3) - English
-                if ( emailTemplates.get(i).getType().ordinal() == 0 && emailTemplates.get(i).getLanguage().ordinal() == 3)
+                if ( emailTemplates.get(i).getType().ordinal() == 0 && emailTemplates.get(i).getLanguage().ordinal() == 3 )
                     return emailTemplates.get(i).getSubject();
         }catch (Exception e){}
 
@@ -70,9 +70,8 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
     @Override
     public String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
         for (int i = 0; i < list(EmailTemplate.class).size(); i++)
-            if (list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
-                    // emailTemplateTypeOrdinal + 1, because first value is 0
-                    list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal + 1)
+            if ( list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
+                    list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal )
                 return list(EmailTemplate.class).get(i).getContent();
         return "";
     }
@@ -80,11 +79,28 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
     @Override
     public String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
         for (int i = 0; i < list(EmailTemplate.class).size(); i++)
-            // emailTemplateTypeOrdinal + 1, because first value is 0
-            if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal + 1 &&
+            if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal &&
                     list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal )
                 return list(EmailTemplate.class).get(i).getContent();
         return "";
     }
 
+    @Override
+    public String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
+        for (int i = 0; i < list(EmailTemplate.class).size(); i++)
+            if ( list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
+                    list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal )
+                return list(EmailTemplate.class).get(i).getSubject();
+        return "";
+    }
+
+    @Override
+    public String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
+        for (int i = 0; i < list(EmailTemplate.class).size(); i++)
+            if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal &&
+                    list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal )
+                return list(EmailTemplate.class).get(i).getSubject();
+        return "";
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/email/daos/IEmailTemplateDAO.java b/libreplan-business/src/main/java/org/libreplan/business/email/daos/IEmailTemplateDAO.java
index 57acd30a9..a48eca74e 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/email/daos/IEmailTemplateDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/email/daos/IEmailTemplateDAO.java
@@ -41,4 +41,7 @@ public interface IEmailTemplateDAO extends IGenericDAO<EmailTemplate, Long>{
 
     String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
     String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
+
+    String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
+    String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index d2187e6cc..2eb97e7e8 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -1325,7 +1325,6 @@ public class ConfigurationController extends GenericForwardComposer {
     }
 
     private boolean isEmailFieldsValid(){
-
         if ( protocolsCombobox.getSelectedItem().getLabel().equals("STARTTLS") &&
                 emailUsernameTextbox.getValue() != null &&
                 emailPasswordTextbox.getValue() != null &&
@@ -1336,5 +1335,4 @@ public class ConfigurationController extends GenericForwardComposer {
 
         else return false;
     }
-
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateController.java b/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateController.java
index 69e4b82aa..91dc01026 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateController.java
@@ -108,6 +108,7 @@ public class EmailTemplateController extends GenericForwardComposer{
     public void setSelectedLanguage(Language language){
         emailTemplateModel.setLanguage(language);
 
+        getSubjectDataBySelectedLanguage();
         getContentDataBySelectedLanguage();
     }
 
@@ -139,6 +140,7 @@ public class EmailTemplateController extends GenericForwardComposer{
     public void setSelectedEmailTemplateEnum(EmailTemplateEnum emailTemplateEnum){
         emailTemplateModel.setEmailTemplateEnum(emailTemplateEnum);
 
+        getSubjectDataBySelectedTemplate();
         getContentDataBySelectedTemplate();
     }
 
@@ -177,4 +179,11 @@ public class EmailTemplateController extends GenericForwardComposer{
     private void getContentDataBySelectedTemplate(){
         contentsTextbox.setValue( emailTemplateModel.getContentBySelectedTemplate( getSelectedEmailTemplateEnum().ordinal(), getSelectedLanguage().ordinal() ) );
     }
+
+    private void getSubjectDataBySelectedLanguage(){
+        subjectTextbox.setValue(emailTemplateModel.getSubjectBySelectedLanguage(getSelectedLanguage().ordinal(), getSelectedEmailTemplateEnum().ordinal()));
+    }
+    private void getSubjectDataBySelectedTemplate(){
+        subjectTextbox.setValue( emailTemplateModel.getContentBySelectedTemplate( getSelectedEmailTemplateEnum().ordinal(), getSelectedLanguage().ordinal() ) );
+    }
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateModel.java
index c54985bf2..1045864b6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateModel.java
@@ -157,6 +157,18 @@ public class EmailTemplateModel implements IEmailTemplateModel {
     public String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
         return emailTemplateDAO.getContentBySelectedTemplate(emailTemplateTypeOrdinal, languageOrdinal);
     }
+
+    @Override
+    @Transactional
+    public String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
+        return emailTemplateDAO.getSubjectBySelectedLanguage(languageOrdinal, emailTemplateTypeOrdinal);
+    }
+
+    @Override
+    @Transactional
+    public String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
+        return emailTemplateDAO.getSubjectBySelectedTemplate(emailTemplateTypeOrdinal, languageOrdinal);
+    }
 }
 
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/email/IEmailTemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/email/IEmailTemplateModel.java
index 09f9f0491..7138f7e02 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/email/IEmailTemplateModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/email/IEmailTemplateModel.java
@@ -46,6 +46,9 @@ public interface IEmailTemplateModel {
     String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
     String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
 
+    String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
+    String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
+
     String getContent();
     void setContent(String content);