anchor.diff:  %%           available in some database.
   %% Returns : NewHeader, keylist record()
   %%--------------------------------------------------------------------
  -add_caller_identity_for_sip("INVITE", Headers, URI) when is_record(URI, sipurl) ->
  +add_caller_identity_for_sip("INVITE", Header) ->
       case sipserver:get_env(remote_party_id, false) of
   	true ->
  -	    case local:get_remote_party_name(URI#sipurl.user, URI) of
  +	    {_, FromURL} = sipheader:from(Header),
  +	    case local:get_remote_party_name(FromURL#sipurl.user, FromURL) of
   		{ok, DisplayName} when is_list(DisplayName) ->
   		    Parameters = [{"party", "calling"}, {"screen", "yes"}, {"privacy", "off"}],
  -		    RPI = contact:new(DisplayName, URI, Parameters),
  +		    RPI = contact:new(DisplayName, FromURL, Parameters),
   		    RemotePartyId = contact:print(RPI),
   		    logger:log(debug, "Remote-Party-Id: ~s", [RemotePartyId]),
  -		    keylist:set("Remote-Party-Id", [RemotePartyId], Headers);
  +		    keylist:set("Remote-Party-Id", [RemotePartyId], Header);
   		none ->
  -		    Headers
  +		    Header
   	    end;
  -	_ ->
  -	    Headers
  +	false ->
  +	    Header
       end;
  -add_caller_identity_for_sip(_, Headers, _) ->
  +add_caller_identity_for_sip(_Method, Header) ->
       %% non-INVITE request, don't add Remote-Party-Id
  -    Headers.
  +    Header.
   
   
   %%--------------------------------------------------------------------
  
positive.code: 
  
  %%--------------------------------------------------------------------
  %% Function: localhostname(Hostname)
  %%           Hostname = string()
  %% Descrip.: Check if given hostname matches one of ours.
  %% Returns : true  |
  %%           false
  %%--------------------------------------------------------------------
  localhostname(Hostname) ->
      util:casegrep(Hostname, sipserver:get_env(myhostnames)).
  
  
  %%--------------------------------------------------------------------
  %% Function: pstngateway(Hostname)
  %%           Hostname = string()
  %% Descrip.: Check if given hostname matches one of our PSTN
  %%           gateways hostnames.
  %% Returns : true  |
  %%           false
  %%--------------------------------------------------------------------
  pstngateway(Hostname) ->
      util:casegrep(Hostname, sipserver:get_env(pstngatewaynames)).
  
  
  
negative.code: 	    NewHeader = add_caller_identity_for_pstn(Method, Header, DstURI, User, PSTNgateway),
  	    sippipe:start(THandler, none, Request#request{header=NewHeader}, DstURI, 900);
  	{stale, User, Class} ->
  	    logger:log(debug, "Auth: User ~p must authenticate (stale) for dst ~s (class ~s)",
  		       [User, DstNumber, Class]),
  	    logger:log(normal, "~s: pstnproxy: Relay ~s to PSTN ~s (~s) -> STALE authentication, sending challenge",
  		       [LogTag, Method, DstNumber, sipurl:print(DstURI)]),
  	    transactionlayer:send_challenge(THandler, proxy, true, none);
  