diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea230d5c..2470d7a3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Extend date parsing error message #173
 
 ### Added
-- Make boundary regex configurable #108 #152 (thanks @EthraZa)
+- Make boundary regex configurable #169 #150 #126 #121 #111 #152 #108 (thanks @EthraZa)
 
 ### Affected Classes
 - NaN
diff --git a/src/config/imap.php b/src/config/imap.php
index d95e637b..e5ec7f1a 100644
--- a/src/config/imap.php
+++ b/src/config/imap.php
@@ -111,6 +111,8 @@
     |   -RFC822
     |       Default TRUE - Set to FALSE to prevent the usage of \imap_rfc822_parse_headers().
     |                      See https://github.com/Webklex/php-imap/issues/115 for more information.
+    |   -Boundary regex used to detect message boundaries. If you are having problems with empty messages, missing
+    |       attachments or anything like this. Be advised that it likes to break which causes new problems..
     |   -Message key identifier option
     |       You can choose between the following:
     |       'id'     - Use the MessageID as array key (default, might cause hickups with yahoo mail)