diff --git a/messaging/mms/message.py b/messaging/mms/message.py
index 6cff8a0..6ec65c9 100644
--- a/messaging/mms/message.py
+++ b/messaging/mms/message.py
@@ -36,6 +36,7 @@ def __init__(self):
             'Message-Type': 'm-send-req',
             'Transaction-Id': '1234',
             'MMS-Version': '1.0',
+            'To': [],
             'Content-Type': ('application/vnd.wap.multipart.mixed', {}),
         }
         self.width = 176
diff --git a/messaging/mms/mms_pdu.py b/messaging/mms/mms_pdu.py
index ed44c46..9a97669 100644
--- a/messaging/mms/mms_pdu.py
+++ b/messaging/mms/mms_pdu.py
@@ -691,8 +691,13 @@ def encode_message_header(self):
         # -- this needs to be added last, according [2] and [4]
         for hdr in headers_to_encode:
             if hdr != 'Content-Type':
-                message_header.extend(
-                    MMSEncoder.encode_header(hdr, headers_to_encode[hdr]))
+                if hdr == 'To':
+                    for client in range(0, len(headers_to_encode[hdr])):
+                        message_header.extend(
+                                MMSEncoder.encode_header(hdr, headers_to_encode[hdr][client]))
+                else:
+                    message_header.extend(
+                        MMSEncoder.encode_header(hdr, headers_to_encode[hdr]))
 
         # Ok, now only "Content-type" should be left
         content_type, ct_parameters = headers_to_encode['Content-Type']