anchor.diff:  -include("include/escalus.hrl").
   -include_lib("exmpp/include/exmpp.hrl").
   
  -chat_to(#client{jid=Jid}, Msg) ->
  +chat_to(Recipient, Msg) ->
       Chat = exmpp_message:chat(Msg),
  -    exmpp_stanza:set_recipient(Chat, Jid).
  +    exmpp_stanza:set_recipient(Chat, get_jid(Recipient)).
   
   chat_to_short_jid(Recipient, Msg) ->
       Chat = exmpp_message:chat(Msg),
  
positive.code:                                 <<"xmlns">>),
                              {<<"name">>, ListName})
                  end )),
          Jid).
  
  privacy_activate(Client, ListName) ->
      privacy_active_or_default(Client, active, ListName).
  
negative.code:     exmpp_xml:append_children(
          exmpp_xml:set_attributes(exmpp_xml:element('item'), Attrs),
          ContentElements).
  
  %%--------------------------------------------------------------------
  %% Helpers
  %%--------------------------------------------------------------------
  
  get_jid(#client{jid=Jid}) ->
      Jid;
  get_jid(Username) when is_atom(Username) ->
      escalus_users:get_jid(Username).
  
  %% FIXME: see roster_add_contact/3 comment,
  %% delete fixing that issue afterwards
  get_short_jid(#client{}=Recipient) ->
      escalus_client:short_jid(Recipient);
  get_short_jid(Username) when is_atom(Username) ->
      escalus_users:get_jid(Username).
  