diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp
index 23b9a16fd..68a6c18b4 100644
--- a/src/deluge_core.cpp
+++ b/src/deluge_core.cpp
@@ -957,9 +957,9 @@ static PyObject *torrent_get_file_info(PyObject *self, PyObject *args)
         file_entry const &currFile = (*i);
 
         file_info = Py_BuildValue(
-            "{s:s,s:d,s:f}",
+            "{s:s,s:L,s:f}",
             "path",     currFile.path.string().c_str(),
-            "size",     double(currFile.size),
+            "size",     currFile.size,
             "progress", progresses[i - start]*100.0
             );
 
diff --git a/src/dgtk.py b/src/dgtk.py
index 4344c78c8..0443a9419 100644
--- a/src/dgtk.py
+++ b/src/dgtk.py
@@ -54,6 +54,11 @@ def cell_data_speed(column, cell, model, iter, data):
     speed_str = common.fspeed(speed)
     cell.set_property('text', speed_str)
 
+def cell_data_size(column, cell, model, iter, data):
+	size = long(model.get_value(iter, data))
+	size_str = common.fsize(size)
+	cell.set_property('text', size_str)
+
 ## Functions to create columns
 
 def add_func_column(view, header, func, data, sortid=None):
diff --git a/src/interface.py b/src/interface.py
index 253b5873f..67600e66c 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -459,7 +459,7 @@ class DelugeGTK:
 
         self.queue_column     =     dgtk.add_text_column(self.torrent_view, "#", TORRENT_VIEW_COL_QUEUE)
         self.name_column    =     dgtk.add_texticon_column(self.torrent_view, _("Name"), TORRENT_VIEW_COL_STATUSICON, TORRENT_VIEW_COL_NAME)
-        self.size_column     =    dgtk.add_func_column(self.torrent_view, _("Size"), size, TORRENT_VIEW_COL_SIZE)
+        self.size_column     =    dgtk.add_func_column(self.torrent_view, _("Size"), dgtk.cell_data_size, TORRENT_VIEW_COL_SIZE)
         self.status_column     =     dgtk.add_progress_column(self.torrent_view, _("Status"), TORRENT_VIEW_COL_PROGRESS, TORRENT_VIEW_COL_STATUS)
         self.seed_column     =    dgtk.add_func_column(self.torrent_view, _("Seeders"), peer, (TORRENT_VIEW_COL_CONNECTED_SEEDS, TORRENT_VIEW_COL_SEEDS))
         self.peer_column     =    dgtk.add_func_column(self.torrent_view, _("Peers"), peer, (TORRENT_VIEW_COL_CONNECTED_PEERS, TORRENT_VIEW_COL_PEERS))
@@ -518,9 +518,9 @@ class DelugeGTK:
         assert(len(all_files) == len(file_filter))
         i=0
         for f in all_files:
-                        self.file_store.append([not file_filter[i], f['path'], common.fsize(f['size']),
-                                        round(f['progress'],2)])
-                        i=i+1
+            self.file_store.append([not file_filter[i], f['path'], f['size'], 
+                                    round(f['progress'], 2)])
+            i=i+1
         
         return True
     
@@ -636,13 +636,13 @@ class DelugeGTK:
 
         self.file_view = self.wtree.get_widget("file_view")
         self.file_glade = gtk.glade.XML(common.get_glade_file("file_tab_menu.glade"), domain='deluge')
-        self.file_menu = self.file_glade.get_widget("file_tab_menu")        
+        self.file_menu = self.file_glade.get_widget("file_tab_menu")
         self.file_glade.signal_autoconnect({     "select_all": self.file_select_all,
                             "unselect_all": self.file_unselect_all,
                             "check_selected": self.file_check_selected,
                             "uncheck_selected": self.file_uncheck_selected,
                             })
-        self.file_store = gtk.ListStore(bool, str, str, float)
+        self.file_store = gtk.ListStore(bool, str, gobject.TYPE_UINT64, float)
         self.file_view.set_model(self.file_store)
         self.file_view.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
         self.file_view.get_selection().set_select_function(self.file_clicked)
@@ -651,7 +651,7 @@ class DelugeGTK:
         
         dgtk.add_toggle_column(self.file_view, _("Download"), 0, toggled_signal=self.file_toggled)
         dgtk.add_text_column(self.file_view, _("Filename"), 1).set_expand(True)
-        dgtk.add_text_column(self.file_view, _("Size"), 2)
+        dgtk.add_func_column(self.file_view, _("Size"), dgtk.cell_data_size, 2)
         dgtk.add_func_column(self.file_view, _("Progress"), percent, 3) 
     
     def file_select_all(self, widget):