--- smsdaemon/SmsPdu.cpp	2008/06/12 11:05:18	61
+++ smsdaemon/SmsPdu.cpp	2008/06/12 13:32:17	65
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <stdlib.h> 
 
-
+#include "common.h"
 #include "util.h"
 
 
@@ -116,6 +116,12 @@
 
 	if (multipart)
 	{
+		if (message.length() > 800)
+		{
+			Common::instance()->logMessage("Trying to send multipart sms > 800 bytes !!!");
+			message = message.substr(0,800);
+		}
+
 		part_count = message.length() / PDU_LEN;
 		if (message.length() % PDU_LEN)
 			part_count++;
@@ -148,18 +154,27 @@
 			message_part = message.substr(0, PDU_LEN);
 			message.erase(0, PDU_LEN);
 
-			pdu.push_back( message_part.length()+ 6 );  //UserDataLength
-			pdu.push_back( 0x05 ); // UDH Len
+			pdu.push_back( message_part.length()+ 7 );  //UserDataLength
+			pdu.push_back( 0x06 ); // UDH Len
 			pdu.push_back( 0x00 ); // UDH Element Identifier
 			pdu.push_back( 0x03 ); // UDH element length
 			pdu.push_back( csms_ref ); // csms_ref reference
 			pdu.push_back( part_count );
 			pdu.push_back( partnr+1 );
+			pdu.push_back( 0x00);
 
 		}
 		else
 		{
-			message_part = message.substr(0,160); //truncate to 160
+			if (message.length() > 160)
+			{
+				message_part = message.substr(0,160); //truncate to 160
+				Common::instance()->logMessage("Truncated message");
+			}
+			else
+			{
+				message_part = message;
+			}
 
 			pdu.push_back( message_part.length() ); //UserDataLength
 		}