diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 5feb4c74f..ca319ebf6 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.24
+PLUGIN_VERSION=		1.24.1
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/pkg-descr b/mail/postfix/pkg-descr
index f9756bc69..77caa0887 100644
--- a/mail/postfix/pkg-descr
+++ b/mail/postfix/pkg-descr
@@ -6,6 +6,10 @@ is completely different.
 Plugin Changelog
 ================
 
+1.24.1
+
+* Align mailbox and message size
+
 1.24
 
 * Disable broken, insecure, legacy NTLM authentication (contributed by Alfred Egger)
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml
index a4af4ed77..a4b9f5c2f 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml
@@ -4,21 +4,18 @@
     <version>1.0.1</version>
     <items>
         <domains>
-                <domain type="ArrayField">
-                        <enabled type="BooleanField">
-                                <Default>1</Default>
-                                <Required>Y</Required>
-                        </enabled>
-                        <domainname type="TextField">
-                                <Default></Default>
-                                <Required>Y</Required>
-                        </domainname>
-                        <destination type="TextField">
-                                <Default></Default>
-                                <Required>N</Required>
-                                <Mask>/^([0-9a-zA-Z.:\-\[\]]){1,64}$/u</Mask>
-                                <ValidationMessage>Only 64 of the following characters are allowed: 0-9a-zA-Z.:-[]</ValidationMessage>
-                        </destination>
+            <domain type="ArrayField">
+                <enabled type="BooleanField">
+                    <Default>1</Default>
+                    <Required>Y</Required>
+                </enabled>
+                <domainname type="TextField">
+                    <Required>Y</Required>
+                </domainname>
+                <destination type="TextField">
+                    <Mask>/^([0-9a-zA-Z.:\-\[\]]){1,64}$/u</Mask>
+                    <ValidationMessage>Only 64 of the following characters are allowed: 0-9a-zA-Z.:-[]</ValidationMessage>
+                </destination>
             </domain>
         </domains>
     </items>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
index a78a6b5b8..ddc1928f9 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
@@ -7,18 +7,9 @@
             <Default>0</Default>
             <Required>Y</Required>
         </enabled>
-        <myhostname type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </myhostname>
-        <mydomain type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </mydomain>
-        <myorigin type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </myorigin>
+        <myhostname type="TextField"/>
+        <mydomain type="TextField"/>
+        <myorigin type="TextField"/>
         <inet_interfaces type="TextField">
             <Default>all</Default>
             <Required>Y</Required>
@@ -37,27 +28,21 @@
             </OptionValues>
         </ip_version>
         <bind_address type="NetworkField">
-            <Required>N</Required>
             <AddressFamily>ipv4</AddressFamily>
         </bind_address>
         <bind_address6 type="NetworkField">
-            <Required>N</Required>
             <AddressFamily>ipv6</AddressFamily>
         </bind_address6>
         <mynetworks type="CSVListField">
             <Default>127.0.0.0/8,[::ffff:127.0.0.0]/104,[::1]/128</Default>
             <Required>Y</Required>
         </mynetworks>
-        <banner type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </banner>
+        <banner type="TextField"/>
         <message_size_limit type="IntegerField">
             <Default>51200000</Default>
             <Required>Y</Required>
         </message_size_limit>
         <masquerade_domains type="CSVListField">
-            <Required>N</Required>
             <Mask>/^([0-9a-z\.\-\_]{1,128})(,[0-9a-z\.\-\_]{1,128})*$/ui</Mask>
             <ValidationMessage>Only up to 128 of the following characters are allowed: 0-9a-zA-Z.-_</ValidationMessage>
         </masquerade_domains>
@@ -85,11 +70,9 @@
         </tlswrappermode>
         <certificate type="CertificateField">
             <Type>cert</Type>
-            <Required>N</Required>
         </certificate>
         <ca type="CertificateField">
             <Type>ca</Type>
-            <Required>N</Required>
         </ca>
         <smtpclient_security type="OptionField">
             <Default>may</Default>
@@ -102,7 +85,6 @@
             </OptionValues>
         </smtpclient_security>
         <relayhost type="TextField">
-            <Required>N</Required>
             <Mask>/^([0-9a-zA-Z.:\-\[\]]){1,64}$/u</Mask>
             <ValidationMessage>Only 64 of the following characters are allowed: 0-9a-zA-Z.:-[]</ValidationMessage>
         </relayhost>
@@ -110,14 +92,8 @@
             <Default>0</Default>
             <Required>Y</Required>
         </smtpauth_enabled>
-        <smtpauth_user type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </smtpauth_user>
-        <smtpauth_password type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </smtpauth_password>
+        <smtpauth_user type="TextField"/>
+        <smtpauth_password type="TextField"/>
         <enforce_recipient_check type="BooleanField">
             <Default>0</Default>
             <Required>Y</Required>
@@ -187,8 +163,6 @@
             <Required>Y</Required>
         </reject_unverified_recipient>
         <delay_warning_time type="IntegerField">
-            <Default>0</Default>
-            <Required>N</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>24</MaximumValue>
             <ValidationMessage>Choose a value between 1 and 24 to activate - 0 or empty to disable.</ValidationMessage>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Recipient.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Recipient.xml
index 5782e4a53..e90726dea 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Recipient.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Recipient.xml
@@ -4,21 +4,21 @@
     <version>1.0.0</version>
     <items>
         <recipients>
-                <recipient type="ArrayField">
-                        <enabled type="BooleanField">
-                                <Default>1</Default>
-                                <Required>Y</Required>
-                        </enabled>
-                        <address type="TextField">
-                                <Required>Y</Required>
-                        </address>
-                        <action type="OptionField">
-                                <Required>Y</Required>
-                                <OptionValues>
-                                    <OK>OK</OK>
-                                    <REJECT>REJECT</REJECT>
-                                </OptionValues>
-                        </action>
+            <recipient type="ArrayField">
+                <enabled type="BooleanField">
+                    <Default>1</Default>
+                    <Required>Y</Required>
+                </enabled>
+                <address type="TextField">
+                    <Required>Y</Required>
+                </address>
+                <action type="OptionField">
+                    <Required>Y</Required>
+                    <OptionValues>
+                        <OK>OK</OK>
+                        <REJECT>REJECT</REJECT>
+                    </OptionValues>
+                </action>
             </recipient>
         </recipients>
     </items>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Sender.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Sender.xml
index 6408af54d..d293eeaf7 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Sender.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Sender.xml
@@ -4,21 +4,21 @@
     <version>1.0.0</version>
     <items>
         <senders>
-                <sender type="ArrayField">
-                        <enabled type="BooleanField">
-                                <Default>1</Default>
-                                <Required>Y</Required>
-                        </enabled>
-                        <address type="TextField">
-                                <Required>Y</Required>
-                        </address>
-                        <action type="OptionField">
-                                <Required>Y</Required>
-                                <OptionValues>
-                                    <OK>OK</OK>
-                                    <REJECT>REJECT</REJECT>
-                                </OptionValues>
-                        </action>
+            <sender type="ArrayField">
+                <enabled type="BooleanField">
+                    <Default>1</Default>
+                    <Required>Y</Required>
+                </enabled>
+                <address type="TextField">
+                    <Required>Y</Required>
+                </address>
+                <action type="OptionField">
+                    <Required>Y</Required>
+                    <OptionValues>
+                        <OK>OK</OK>
+                        <REJECT>REJECT</REJECT>
+                    </OptionValues>
+                </action>
             </sender>
         </senders>
     </items>