diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index c0ea211d..89aadbc2 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -164,12 +164,13 @@ function mailstream_do_images($a, &$item, &$attachments) {
 	preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
 	preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
 	foreach (array_merge($matches1[3], $matches2[1]) as $url) {
+		$components = parse_url($url);
 		$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
 		$curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
 		$attachments[$url] = [
 			'data' => $curlResult->getBody(),
 			'guid' => hash("crc32", $url),
-			'filename' => basename($url),
+			'filename' => basename($components['path']),
 			'type' => $curlResult->getContentType()
 		];