diff --git a/modules/system.py b/modules/system.py
index b928d6d..d1fa62a 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -415,7 +415,7 @@ def send_message(message, ch, nodeid=0, nodeInt=1):
 
         for word in split_message:
             if len(line + word) < MESSAGE_CHUNK_SIZE:
-                if word == 'NEWLINE':
+                if 'NEWLINE' in word or '\n' in word or '\r' in word or 'NEWLINE ' in word:
                     # chunk by newline if it exists
                     message_list.append(line)
                     line = ''