diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c
index d813536..513af23 100644
--- a/mbuni/mmsc/mmsproxy.c
+++ b/mbuni/mmsc/mmsproxy.c
@@ -1830,7 +1830,7 @@ static void mm7eaif_dispatch(MmsHTTPClientInfo *h)
 	   " --> Enterred eaif send interface, blen=%d <--- ", 
 	   msize);
 
-     
+     hfrom = http_header_value(h->headers, octstr_imm("X-NOKIA-MMSC-From"));     
      if (!h->body ||  /* A body is required, and must parse */
 	 (m = mms_frombinary(h->body, hfrom ? hfrom : octstr_imm("anon@anon"))) == NULL) {
 	  http_header_add(rh, "Content-Type", "text/plain"); 
@@ -1887,7 +1887,7 @@ static void mm7eaif_dispatch(MmsHTTPClientInfo *h)
      if (expiryt < 0)
 	  expiryt = time(NULL) + settings->default_msgexpiry;
 
-     if ((hfrom = http_header_value(h->headers, octstr_imm("X-NOKIA-MMSC-From"))) == NULL)
+     if (hfrom == NULL)
 	  hfrom = http_header_value(mh, octstr_imm("From"));
      
      mms_remove_headers(m, "Bcc");