PhpStorm is removing BOM from UTF-8 JavaScript file

It appears that when I open a UTF-8 encoded JavaScript file with an existing BOM, PhpStorm strips out the BOM when the file is saved. The JS files belong to a Visual Studio project, but I use PhpStorm for editing since the VS editor pales in comparison. However, when I open the files in VS after editing them, VS complains that the encoding has changed because the BOM has been stripped out. This also makes checking the file into TFS a burden since it won't compare the new file with the old version since it thinks the encoding is different. It would be nice if there was an option to preserve the BOM on save. There appear to be two bugs in your bug tracker related to this issue, WI-2837 and WI-2860, but I'm not sure they're the same.

Is there any chance of this being fixed soon? My company is currently evaluating the product for purchase, but this issue makes it a tough sell. Thanks for any help.