Wrong filename when downloading

I came across the following error. When i use the file_entity module to generate a download link to a file the download page uses the following headers:

$headers = array(
    'Content-Type' => 'force-download',
    'Content-Disposition' => 'attachment; filename="' . $file->filename . '"',
    'Content-Length' => $file->filesize,
    'Content-Transfer-Encoding' => 'binary',
    'Pragma' => 'no-cache',
    'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0',
    'Expires' => '0',
    'Accept-Ranges' => 'bytes',
  );

It uses the file objects filename as the download file name. However, the filename is a changeable value. That means that when you change the name and lose the file extension in the name it doesn't give me a correct file for downloading.

I've made a patch that adds the actual file name from the uri instead of the filename. I will create that patch and add it to this issue.