diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 90d1c3ddf..dc9b7773a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -945,7 +945,7 @@
[mailAccount setObject: delegates forKey: @"delegates"];
// 9. Security
- if ([[_defaults mailCertificate] length])
+ if ([[self domainDefaults] mailCertificateEnabled] && [[_defaults mailCertificate] length])
{
security = [NSMutableDictionary new];
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 6905b46bc..602c5a6bd 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -410,7 +410,7 @@ static SoProduct *preferencesProduct = nil;
{
auxAccount = [accounts objectAtIndex: i];
security = [auxAccount objectForKey: @"security"];
- if (security)
+ if (security && [domainDefaults mailCertificateEnabled])
{
limitedSecurity = [NSMutableDictionary dictionaryWithDictionary: security];
if ([limitedSecurity objectForKey: @"certificate"])
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 85e34c3f1..7c36b1546 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -231,15 +231,15 @@
-
+
-
+
-
+
@@ -248,7 +248,7 @@
-
+
{{ editor.message.editable.priority == 1 ? 'check' : null }}
@@ -286,7 +286,7 @@