There's a temporary solution in http://www.elfisk.dk/modules.php?op=modload&name=XForum&file=viewthread&tid=30#pid107
Actually the simple fix is closer to the correct than you propose (and as I would have proposed myself). All images are always stored as PNG files! So no matter the original content-type the new one should be "image/png".
Template courtesy of Designs By Darren.