diff --git a/dom/mms/src/ril/MmsService.js b/dom/mms/src/ril/MmsService.js
index d99cbb6cd81..fc47b26ca33 100644
--- a/dom/mms/src/ril/MmsService.js
+++ b/dom/mms/src/ril/MmsService.js
@@ -32,6 +32,11 @@ const STORAGE_STREAM_SEGMENT_SIZE = 4096;
 // @see http://tools.ietf.org/html/rfc2616#page-39
 const HTTP_STATUS_OK = 200;
 
+const CONFIG_SEND_REPORT_NEVER       = 0;
+const CONFIG_SEND_REPORT_DEFAULT_NO  = 1;
+const CONFIG_SEND_REPORT_DEFAULT_YES = 2;
+const CONFIG_SEND_REPORT_ALWAYS      = 3;
+
 XPCOMUtils.defineLazyServiceGetter(this, "gpps",
                                    "@mozilla.org/network/protocol-proxy-service;1",
                                    "nsIProtocolProxyService");
@@ -57,12 +62,36 @@ MmsService.prototype = {
                                          Ci.nsIObserver,
                                          Ci.nsIProtocolProxyFilter]),
 
+  /**
+   * Whether or not should we enable X-Mms-Report-Allowed in M-NotifyResp.ind
+   * and M-Acknowledge.ind PDU.
+   */
+  confSendDeliveryReport: CONFIG_SEND_REPORT_DEFAULT_YES,
+
   proxyInfo: null,
   MMSC: null,
 
   /** MMS proxy filter reference count. */
   proxyFilterRefCount: 0,
 
+  /**
+   * Calculate Whether or not should we enable X-Mms-Report-Allowed.
+   *
+   * @param config
+   *        Current config value.
+   * @param wish
+   *        Sender wish. Could be undefined, false, or true.
+   */
+  getReportAllowed: function getReportAllowed(config, wish) {
+    if ((config == CONFIG_SEND_REPORT_DEFAULT_NO)
+        || (config == CONFIG_SEND_REPORT_DEFAULT_YES)) {
+      if (wish != null) {
+        config += (wish ? 1 : -1);
+      }
+    }
+    return config >= CONFIG_SEND_REPORT_DEFAULT_YES;
+  },
+
   /**
    * Acquire referece-counted MMS proxy filter.
    */
@@ -175,11 +204,14 @@ MmsService.prototype = {
    *        X-Mms-Transaction-ID of the message.
    * @param status
    *        X-Mms-Status of the response.
+   * @param ra
+   *        X-Mms-Report-Allowed of the response.
    *
    * @see OMA-TS-MMS_ENC-V1_3-20110913-A section 6.2
    */
-  sendNotificationResponse: function sendNotificationResponse(tid, status) {
-    debug("sendNotificationResponse: tid = " + tid + ", status = " + status);
+  sendNotificationResponse: function sendNotificationResponse(tid, status, ra) {
+    debug("sendNotificationResponse: tid = " + tid + ", status = " + status
+          + ", reportAllowed = " + ra);
 
     let headers = {};
 
@@ -189,7 +221,7 @@ MmsService.prototype = {
     headers["x-mms-mms-version"] = MMS.MMS_VERSION;
     headers["x-mms-status"] = status;
     // Optional fields
-    headers["x-mms-report-allowed"] = true;
+    headers["x-mms-report-allowed"] = ra;
 
     let istream = MMS.PduHelper.compose(null, {headers: headers});
     this.sendMmsRequest("POST", this.MMSC, istream);
@@ -308,7 +340,17 @@ MmsService.prototype = {
   handleNotificationIndication: function handleNotificationIndication(msg) {
     function callback(status, retr) {
       let tid = msg.headers["x-mms-transaction-id"];
-      this.sendNotificationResponse(tid, status);
+
+      // For X-Mms-Report-Allowed
+      let wish = msg.headers["x-mms-delivery-report"];
+      // `The absence of the field does not indicate any default value.`
+      // So we go checking the same field in retrieved message instead.
+      if ((wish == null) && retr) {
+        wish = retr.headers["x-mms-delivery-report"];
+      }
+      let ra = this.getReportAllowed(this.confSendDeliveryReport, wish);
+
+      this.sendNotificationResponse(tid, status, ra);
     }
 
     function retrCallback(error, retr) {
@@ -340,6 +382,11 @@ MmsService.prototype = {
       }
     }
 
+    // Fix default header field values.
+    if (msg.headers["x-mms-delivery-report"] == null) {
+      msg.headers["x-mms-delivery-report"] = false;
+    }
+
     let status = msg.headers["x-mms-retrieve-status"];
     if ((status != null) && (status != MMS.MMS_PDU_ERROR_OK)) {
       callbackIfValid(status, msg);