image with spaces in name is not rendered well in HTML mail

When an image is uploaded to an imagefield cck field and that image has spaces in the name, that image is often not displayed well in the HTML mail.

In the resulting email the url of that image has 2 spaces in stead of one.

the image uploaded is called . In the nodeview of the newsletter node on the site it is displayed ok. in the email the url is changed to

The one space is replace by 2x %20, which off course results in a 404 for that image.

The problem seems to be when drupal_mail is called. Before that the node_body is ok, after that the "message" often contains a new_line after the space, which is then translated by mimemail into 2 spaces (%20).

This could be seen as a mimemail problem or a drupal_mail problem, but I place it here because simplenews calls them both.

I could only solve it by rewriting the simplenews-newsletter-body.tpl.php for the images:

             <?php
                  $image = $node->field_newsletterimage[0];
            
	          $path = substr($image['filepath'], 0, strrpos($image['filepath'],"/"));
	          $file = substr($image['filepath'], strrpos($image['filepath'],"/"));
	          $url = $path."/".rawurlencode($file);
            ?>
  	    <img src="<?php print $GLOBALS['base_url'].'/'.$url;?>" title='<?php print ($image["data"]["title"]) ?>' />

(rawurlencode gives a + with a space and that is not abbreviated by drupal_mail)

But this is not a proper solution.

I think simplenews somewhere has to do this better (with some $regexp magic that I'm not familiar enough with), to solve it.