Issue 323 send link url fix

This fixes #323.  No new tests for it, though - see notes in the last commit.