Fixed some url matching for messaging/email