Slightly better solution is to leave the header enabled, but add something like this into image.php:
Code:
$nocom = str_replace(",", "", $imageinfo['filename']);
header('Pragma:'); // VBIV-8269
header('Cache-control: max-age=31536000');
header('Expires: ' . gmdate('D, d M Y H:i:s', (TIMENOW + 31536000)) . ' GMT');
header('Content-disposition: inline; filename=' . $nocom);
There's also a hook up there, so I'm sure you could just do the same with a hook.