diff --git a/ChangeLog b/ChangeLog
index e4b2a09e1..37d176601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+=== Deluge 1.3.3 (In Development) ===
+==== Core ====
+	* Properly show the 'Checking Resume Data' state instead of just 7
+
+==== GtkUI ===
+	* Show the checking icon for torrents in the 'Checking Resume Data' state
+
 === Deluge 1.3.2 (24 May 2011) ===
 ==== Core ====
 	* #1527: Fix Converting unicode to unicode error in move_storage
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index f1dd5e712..2e657a74d 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -346,7 +346,10 @@ class Torrent(object):
 
         # Set self.state to the ltstate right away just incase we don't hit some
         # of the logic below
-        self.state = str(ltstate)
+        if ltstate in LTSTATE:
+            self.state = LTSTATE[ltstate]
+        else:
+            self.state = str(ltstate)
 
         log.debug("set_state_based_on_ltstate: %s", deluge.common.LT_TORRENT_STATE[ltstate])
         log.debug("session.is_paused: %s", component.get("Core").session.is_paused())
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 07871c9d5..9fa47e476 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -75,7 +75,8 @@ ICON_STATE = {
     "Seeding": icon_seeding,
     "Paused": icon_inactive,
     "Error": icon_alert,
-    "Queued": icon_queued
+    "Queued": icon_queued,
+    "Checking Resume Data": icon_checking
 }
 
 def cell_data_statusicon(column, cell, model, row, data):