diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index fa4c005..5e569ef 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* MMSC fix: don't send subject in notification if size optimisation turned on
 2009-03-28 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Improved pgsql-queue module: re-connect to db if connections die, only allocate as many connections as needed
 2009-03-05 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index 967e6f8..9ceaaae 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1643,7 +1643,7 @@ MmsMsg *mms_notification(Octstr *from, Octstr *subject,
      if (from)
 	  http_header_add(m->headers, "From", octstr_get_cstr(from));
 
-     if (subject)
+     if (subject && !optimizesize)
 	  http_header_add(m->headers, "Subject", octstr_get_cstr(subject));
      
      http_header_add(m->headers, "X-Mms-Message-Class",