diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index f32672b..a38e33a 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2006-11-28 Paul A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor fix for MM7 VAS GW error code (should be VASPErrorRsp)
 2006-11-27  Paul A. Bagyenda <bagyenda@dsmagic.com>
 	* Kannel dependency now pre-1.4.2 CVS
 2006-11-25 Paul A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index 5e69250..c8787d2 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -1030,7 +1030,7 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
      return m;
 }
 
-MSoapMsg_t *mm7_make_resp(MSoapMsg_t *mreq, int status, Octstr *msgid)
+MSoapMsg_t *mm7_make_resp(MSoapMsg_t *mreq, int status, Octstr *msgid, int isclientside)
 {
      int mtype = mreq ? mm7_msgtype(mreq) : -1;
      Octstr *transid;
@@ -1041,7 +1041,7 @@ MSoapMsg_t *mm7_make_resp(MSoapMsg_t *mreq, int status, Octstr *msgid)
      transid =  mreq ?   http_header_value(mreq->envelope, octstr_imm("TransactionID")) : NULL;
      
      if (!MM7_SOAP_STATUS_OK(status) || mtype < 0)
-	  mresp = mm7_soap_create(MM7_TAG_RSErrorRsp, transid);
+	  mresp = mm7_soap_create(isclientside ? MM7_TAG_VASPErrorRsp : MM7_TAG_RSErrorRsp, transid);
      else 
 	  mresp = mm7_soap_create(mtype + 1, transid);
 
diff --git a/mbuni/mmlib/mms_mm7soap.h b/mbuni/mmlib/mms_mm7soap.h
index e17f0a5..999c514 100644
--- a/mbuni/mmlib/mms_mm7soap.h
+++ b/mbuni/mmlib/mms_mm7soap.h
@@ -55,7 +55,7 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
 			       Octstr *linkedid,
 			       int isclientside, 
 			       char *vaspid, char *vasid);
-MSoapMsg_t *mm7_make_resp(MSoapMsg_t *mreq, int status, Octstr *msgid);
+MSoapMsg_t *mm7_make_resp(MSoapMsg_t *mreq, int status, Octstr *msgid, int isclientside);
 /* Return the header value for some header. */
 Octstr *mm7_soap_header_value(MSoapMsg_t *m, Octstr *header);
 #endif
diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index 7ad2c37..5a6c6a0 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -145,7 +145,7 @@ static void mm7soap_receive(MmsHTTPClientInfo *h)
 	   mreq ? (char *)msgtype : "Null");
           
      if (!mreq) {
-	  mresp = mm7_make_resp(NULL, MM7_SOAP_FORMAT_CORRUPT, NULL);
+       mresp = mm7_make_resp(NULL, MM7_SOAP_FORMAT_CORRUPT, NULL,1);
 	  goto done;
      } 
 
@@ -193,7 +193,7 @@ static void mm7soap_receive(MmsHTTPClientInfo *h)
 	       octstr_destroy(value);	      
 	  }  else 
 	       status = 4000;	  
-	  mresp = mm7_make_resp(mreq, status, NULL);
+	  mresp = mm7_make_resp(mreq, status, NULL,1);
 	  break; 	  
 	  
      case MM7_TAG_DeliveryReportReq:
@@ -206,7 +206,7 @@ static void mm7soap_receive(MmsHTTPClientInfo *h)
 	       octstr_destroy(value);
 	  mms_log("DeliveryReport", 
 		  from, NULL, -1, msgid, NULL, h->m->id, "MMSBox", h->ua, NULL);
-	  mresp = mm7_make_resp(mreq, status, NULL);
+	  mresp = mm7_make_resp(mreq, status, NULL,1);
 	  break;
      
      case MM7_TAG_ReadReplyReq:
@@ -219,11 +219,11 @@ static void mm7soap_receive(MmsHTTPClientInfo *h)
 	       octstr_destroy(value);
 	  mms_log("ReadReport", 
 		  from, NULL, -1, msgid, NULL, h->m->id, "MMSBox", h->ua, NULL);
-	  mresp = mm7_make_resp(mreq, status, NULL);
+	  mresp = mm7_make_resp(mreq, status, NULL,1);
 	  break;
 	  
      default:
-	  mresp = mm7_make_resp(mreq, MM7_SOAP_UNSUPPORTED_OPERATION, NULL);
+	  mresp = mm7_make_resp(mreq, MM7_SOAP_UNSUPPORTED_OPERATION, NULL,1);
 	  break;	  
      }
      
diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c
index cc348b5..dee16ed 100644
--- a/mbuni/mmsc/mmsproxy.c
+++ b/mbuni/mmsc/mmsproxy.c
@@ -1605,7 +1605,7 @@ static void mm7soap_dispatch(MmsHTTPClientInfo *h)
 	   mreq ? (char *)msgtype : "Null");
           
      if (!mreq) {
-	  mresp = mm7_make_resp(NULL, MM7_SOAP_FORMAT_CORRUPT, NULL);
+       mresp = mm7_make_resp(NULL, MM7_SOAP_FORMAT_CORRUPT, NULL,0);
 	  goto done;
      } 
      
@@ -1647,7 +1647,7 @@ static void mm7soap_dispatch(MmsHTTPClientInfo *h)
 		    octstr_destroy(value);	      
 	  }  else 
 	       status = 4004;	  
-	  mresp = mm7_make_resp(mreq, status, msgid);
+	  mresp = mm7_make_resp(mreq, status, msgid,0);
 	  break; 
 
      case MM7_TAG_ReplaceReq:
@@ -1708,7 +1708,7 @@ static void mm7soap_dispatch(MmsHTTPClientInfo *h)
 		     octstr_get_cstr(h->vasp->id));		    
 	  }
 	  
-	  mresp = mm7_make_resp(mreq, status, NULL);
+	  mresp = mm7_make_resp(mreq, status, NULL,0);
 	  break;
 	  
      case MM7_TAG_CancelReq:
@@ -1740,10 +1740,10 @@ static void mm7soap_dispatch(MmsHTTPClientInfo *h)
 		     msgid ? octstr_get_cstr(msgid) : "NULL",
 		     octstr_get_cstr(h->vasp->id));		    
 	  }
-	  mresp = mm7_make_resp(mreq, status, NULL);
+	  mresp = mm7_make_resp(mreq, status, NULL,0);
 	  break;
      default:
-	  mresp = mm7_make_resp(mreq, MM7_SOAP_UNSUPPORTED_OPERATION, NULL);
+       mresp = mm7_make_resp(mreq, MM7_SOAP_UNSUPPORTED_OPERATION, NULL,0);
 	  break;	  
      }