URL Encoding Oddity

I put this in the wrong support forum initially - apologies for the double post. I'm pretty sure it's a CKEditor problem rather than CKFinder.
---------------------
Hi All,

I'm using CKEditor 3.5.2 with CKFinder 2.0. I've set everything up so that I can include files and links in the content being edited by CKEditor with "Browse Server" using CKFinder as the file browser. Almost everything works except for one little quirk.

If I make a link or include an image with a URL that includes odd characters (space, ampersand and so on) they are correctly URL encoded when passed to the dialog in CKEditor from CKFinder. However, when I submit the content or do right click image properties the URLs are no longer URL encoded (bizarrely the links behave correctly).

Here is an example before (when passed back from CKFinder):

https://wibble.com:8443/cms/view.action?showfile=/My%20Folder/Public%20Content/puffin.gif