use short message instead of destination_addr (thanks @jerith @justinvdm)