diff --git a/core/AmSipMsg.cpp b/core/AmSipMsg.cpp
index a5cb2631..1642e1ae 100644
--- a/core/AmSipMsg.cpp
+++ b/core/AmSipMsg.cpp
@@ -80,7 +80,8 @@ bool findHeader(const string& hdrs,const string& hdr_name,
       p = hdrs_c - hdrs.c_str();
 	    
       string::size_type p_end;
-      if((p_end = hdrs.find('\n',p)) != string::npos){
+      if( ((p_end = hdrs.find('\r',p)) != string::npos)
+	  || ((p_end = hdrs.find('\n',p)) != string::npos) ){
 		
 	free(hdr);
 	// return hdrs.substr(p,p_end-p);
diff --git a/core/AmUtils.cpp b/core/AmUtils.cpp
index ec9b9562..2e46e00a 100644
--- a/core/AmUtils.cpp
+++ b/core/AmUtils.cpp
@@ -691,11 +691,23 @@ string get_header_param(const string& hdr_string,
 	&& hdr_string.substr(++pos, param_name.length())==param_name 
 	&& hdr_string[pos+param_name.length()] == '=') {
       size_t pos2 = pos+param_name.length()+1;
-      while(pos2<hdr_string.length() && hdr_string[pos2] != ';'
-	    && hdr_string[pos2] != '\n')
-	pos2++;
-      return hdr_string.substr(pos + param_name.length()+1, 
-			       pos2 - pos + - param_name.length() -1);
+      while(pos2<hdr_string.length()){
+
+	  switch(hdr_string[pos2]) {
+	  case ';':
+	  case '\n':
+	  case '\r':
+	      break;
+
+	  default:
+	      pos2++;
+	      continue;
+	  }
+
+	  break;
+      }
+      return hdr_string.substr(pos + param_name.length() + 1, // skip 'param=' 
+			       pos2 - pos - param_name.length() - 1);
     }
     pos +=param_name.length();
   }