diff --git a/rules/os/os_exchange_SMIME_encryption_certificate_overwrite_disable.yaml b/rules/os/os_exchange_SMIME_encryption_certificate_overwrite_disable.yaml
index 5a31c44e1..c970c2eb3 100644
--- a/rules/os/os_exchange_SMIME_encryption_certificate_overwrite_disable.yaml
+++ b/rules/os/os_exchange_SMIME_encryption_certificate_overwrite_disable.yaml
@@ -22,5 +22,6 @@ tags:
 supervised: false
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMEEncryptionCertificateUUIDUserOverrideable: false
diff --git a/rules/os/os_exchange_SMIME_encryption_default_certificate_overwrite_enable.yaml b/rules/os/os_exchange_SMIME_encryption_default_certificate_overwrite_enable.yaml
index 38100f4c3..d4b796365 100644
--- a/rules/os/os_exchange_SMIME_encryption_default_certificate_overwrite_enable.yaml
+++ b/rules/os/os_exchange_SMIME_encryption_default_certificate_overwrite_enable.yaml
@@ -22,4 +22,5 @@ tags:
 mobileconfig: true
 mobileconfig_info:
   com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMEEncryptByDefaultUserOverrideable: false
diff --git a/rules/os/os_exchange_SMIME_encryption_per_message_disable.yaml b/rules/os/os_exchange_SMIME_encryption_per_message_disable.yaml
index ad7b60a71..6f8e326a7 100644
--- a/rules/os/os_exchange_SMIME_encryption_per_message_disable.yaml
+++ b/rules/os/os_exchange_SMIME_encryption_per_message_disable.yaml
@@ -5,7 +5,8 @@ discussion: |
 
   The user _MUST_ not be enabled to have the option to decide wether to encrypt a mail communication. Encryption _MUST_ be the default.
 check: " "
-fix: This is implemented by a Configuration Profile
+fix: |
+  This is implemented by a Configuration Profile.
 references:
   cce:
     - CCE-94528-7
@@ -21,5 +22,6 @@ tags:
 severity: "medium"
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMEEnableEncryptionPerMessageSwitch: false
diff --git a/rules/os/os_exchange_SMIME_signing_certificate_overwrite_disable.yaml b/rules/os/os_exchange_SMIME_signing_certificate_overwrite_disable.yaml
index 2fa000763..48893c9ef 100644
--- a/rules/os/os_exchange_SMIME_signing_certificate_overwrite_disable.yaml
+++ b/rules/os/os_exchange_SMIME_signing_certificate_overwrite_disable.yaml
@@ -21,5 +21,6 @@ tags:
   - indigo_high
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMESigningCertificateUUIDUserOverrideable: false
diff --git a/rules/os/os_exchange_SMIME_signing_enabled.yaml b/rules/os/os_exchange_SMIME_signing_enabled.yaml
index 1db51472e..657306f5d 100644
--- a/rules/os/os_exchange_SMIME_signing_enabled.yaml
+++ b/rules/os/os_exchange_SMIME_signing_enabled.yaml
@@ -21,5 +21,6 @@ tags:
   - indigo_high
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMESigningEnabled: true
diff --git a/rules/os/os_exchange_SMIME_signing_overwrite_disable.yaml b/rules/os/os_exchange_SMIME_signing_overwrite_disable.yaml
index 3d9507573..128df8aaa 100644
--- a/rules/os/os_exchange_SMIME_signing_overwrite_disable.yaml
+++ b/rules/os/os_exchange_SMIME_signing_overwrite_disable.yaml
@@ -21,5 +21,6 @@ tags:
   - indigo_high
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     SMIMESigningUserOverrideable: false
diff --git a/rules/os/os_exchange_mail_recents_sync_disable.yaml b/rules/os/os_exchange_mail_recents_sync_disable.yaml
index 7a2dac7d9..ba7147e0b 100644
--- a/rules/os/os_exchange_mail_recents_sync_disable.yaml
+++ b/rules/os/os_exchange_mail_recents_sync_disable.yaml
@@ -23,4 +23,5 @@ supervised: false
 mobileconfig: true
 mobileconfig_info:
   com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     disableMailRecentsSyncing: true
diff --git a/rules/os/os_exchange_peraccountVPN.yaml b/rules/os/os_exchange_peraccountVPN.yaml
index f2145932a..4b5755909 100644
--- a/rules/os/os_exchange_peraccountVPN.yaml
+++ b/rules/os/os_exchange_peraccountVPN.yaml
@@ -26,5 +26,6 @@ tags:
 supervised: false
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     VPNUUID: $ODV
diff --git a/rules/os/os_exchange_prevent_move_enforce.yaml b/rules/os/os_exchange_prevent_move_enforce.yaml
index f45a43ef3..f8f9ef585 100644
--- a/rules/os/os_exchange_prevent_move_enforce.yaml
+++ b/rules/os/os_exchange_prevent_move_enforce.yaml
@@ -23,5 +23,6 @@ tags:
 supervised: false
 mobileconfig: true
 mobileconfig_info:
-  com.apple.mail.managed: 
+  com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     PreventMove: true
diff --git a/rules/os/os_mail_maildrop_disable.yaml b/rules/os/os_mail_maildrop_disable.yaml
index 595a9a2f4..7b1a7208a 100644
--- a/rules/os/os_mail_maildrop_disable.yaml
+++ b/rules/os/os_mail_maildrop_disable.yaml
@@ -51,4 +51,5 @@ supervised: false
 mobileconfig: true
 mobileconfig_info:
   com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     allowMailDrop: false
diff --git a/rules/os/os_mail_move_messages_disable.yaml b/rules/os/os_mail_move_messages_disable.yaml
index 36639c1a8..ee57fe6f8 100644
--- a/rules/os/os_mail_move_messages_disable.yaml
+++ b/rules/os/os_mail_move_messages_disable.yaml
@@ -53,4 +53,5 @@ supervised: false
 mobileconfig: true
 mobileconfig_info:
   com.apple.mail.managed:
+    EmailAccountType: EmailTypeIMAP
     PreventMove: false