diff --git a/etc/motds32/motds32.conf b/etc/motds32/motds32.conf
index 2e8e9eb..932ac9f 100755
--- a/etc/motds32/motds32.conf
+++ b/etc/motds32/motds32.conf
@@ -22,19 +22,19 @@ CPU_CRITICAL=100
 
 # Usage of SWAP space warning limit in percent [%]
 # The default warning limit is set to 10%
-SWAP_USAGE_WARNING=10
+SWAP_USAGE_WARNING=20
 
 # Usage of SWAP space critical limit in percent [%]
 # The default critical limit is set to 30%
-SWAP_USAGE_CRITICAL=30
+SWAP_USAGE_CRITICAL=50
 
 # Mail Queue size warning limit. Number of e-mails in mailq. By default the
 # mailq checking is disabled (set to 0)
 MAILQ_WARNING=5
 
 # Limit the report to maximum number of n lines (including 2 rows header)
-# Default is set to 15 rows.
-MAX_ROWS_LIMIT=15
+# Default is set to 6 rows.
+MAX_ROWS_LIMIT=6
 
 # Check if NTP is synchronizes from NTP sources [YES/NO]. 
 # Default is set to "NO"