diff --git a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
index 0fe44b370e7395b54208725d0254882fc39139c5..8e34b8f8185c310274fa3843e1926696df107c04 100644
--- a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
@@ -4,7 +4,7 @@
 
 
 
-
+error.too.long=Die Vorlage ist zu gross. Maximale Gr\u00F6sse ist {0}\!
 recipients.all=Alle anzeigen
 recipients.hide=Weniger anzeigen
 recipients.more=... und {0} weitere Empf\u00E4nger
diff --git a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
index 9916fe1069541681ca893332ae5f76a9e69d4687..60837ade1aa1a9fc703a9440774485523200e2f2 100644
--- a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
@@ -1,6 +1,7 @@
 #Tue Nov 15 09:58:15 CET 2016
 add.email=Add
 contact.cp.from=Copy sent to addresser
+error.too.long=the template is too big. The maximal size is {0}\!
 footer.no.userdata=<p>This message has been sent automatically via the learning platform OpenOLAT\: {0}</p>
 footer.with.userdata=<p>Sender\: {2} {3} ({0}), {4} {5}</p><p>This message has been sent via the learning platform OpenOLAT\: {1}</p>
 mail.action.emtpy=Select at least one e-mail to perform this action.
diff --git a/src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java b/src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java
index 8bc9222bd2b94a064457f4bb6843de01c5c90979..256fbc24eba21c428dbb6966e9cfa303d9056190 100644
--- a/src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java
+++ b/src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java
@@ -19,7 +19,6 @@
  */
 package org.olat.core.util.mail.ui;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
@@ -27,30 +26,27 @@ import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.Formatter;
 import org.olat.core.util.Util;
 import org.olat.core.util.mail.MailManager;
 import org.olat.core.util.mail.MailModule;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 
- * Description:<br>
- * Customize the mail template
- * 
- * <P>
  * Initial Date:  14 avr. 2011 <br>
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  */
 public class MailTemplateAdminController extends FormBasicController  {
 
+	private static final int MAX_LENGTH = 10 * 1000 * 1000;
+	
 	private TextElement templateEl;
 	
-	private final MailManager mailManager;
+	@Autowired
+	private MailManager mailManager;
 	
 	public MailTemplateAdminController(UserRequest ureq, WindowControl wControl) {
 		super(ureq, wControl, null, Util.createPackageTranslator(MailModule.class, ureq.getLocale()));
-		
-		mailManager = CoreSpringFactory.getImpl(MailManager.class);
-		
 		initForm(ureq);
 	}
 
@@ -61,7 +57,7 @@ public class MailTemplateAdminController extends FormBasicController  {
 		setFormContextHelp("E-Mail Settings#_template");
 
 		String def = mailManager.getMailTemplate();
-		templateEl = uifactory.addTextAreaElement("mail.template", "mail.template", 10000, 25, 50, true, def, formLayout);
+		templateEl = uifactory.addTextAreaElement("mail.template", "mail.template", -1, 25, 50, true, def, formLayout);
 
 		final FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttonLayout", getTranslator());
 		buttonGroupLayout.setRootForm(mainForm);
@@ -77,15 +73,18 @@ public class MailTemplateAdminController extends FormBasicController  {
 	
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
-		boolean allOk = true;
+		boolean allOk = super.validateFormLogic(ureq);
 		
 		String value = templateEl.getValue();
 		templateEl.clearError();
 		if(value.length() <= 0) {
-			templateEl.setErrorKey("", null);
+			templateEl.setErrorKey("form.legende.mandatory", null);
+			allOk = false;
+		} else if(value.length() > MAX_LENGTH) {
+			templateEl.setErrorKey("error.too.long", new String[] { Formatter.formatBytes(MAX_LENGTH) } );
 			allOk = false;
 		}
-		return allOk & super.validateFormLogic(ureq);
+		return allOk;
 	}
 
 	@Override