diff --git a/documentation/changelog.html b/documentation/changelog.html
index f43f0929..7150c5ec 100644
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -184,6 +184,7 @@ hr {
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-829'>SPARK-829</a>] - XMPP URI not working in some cases.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-830'>SPARK-830</a>] - Fix start on startup issue with installer.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-831'>SPARK-831</a>] - XMPP URI not starting conversations when spark is not running.</li>
+<li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-832'>SPARK-832</a>] - Offline messages not showing up in certain situations.</li>
 </ul>
 
 <h2>2.5.6 -- <span style="font-weight: normal;">August 23rd, 2007</span></h2>
diff --git a/src/java/org/jivesoftware/spark/Workspace.java b/src/java/org/jivesoftware/spark/Workspace.java
index b20027ff..743b82dc 100644
--- a/src/java/org/jivesoftware/spark/Workspace.java
+++ b/src/java/org/jivesoftware/spark/Workspace.java
@@ -89,7 +89,6 @@ public class Workspace extends JPanel implements PacketListener {
 
     private static Workspace singleton;
     private static final Object LOCK = new Object();
-    private List<Message> offlineMessages = new ArrayList<Message>();
 
     private JPanel cardPanel;
     private CardLayout cardLayout;
@@ -265,19 +264,6 @@ public class Workspace extends JPanel implements PacketListener {
             }
         }, 2000);
 
-        // Loads offline messages after a 1000 second delay.
-        final TimerTask offlineTask = new SwingTimerTask() {
-            public void doRun() {
-                for (Message offlineMessage : offlineMessages) {
-                    handleOfflineMessage(offlineMessage);
-                }
-
-                offlineMessages.clear();
-            }
-        };
-
-        TaskEngine.getInstance().schedule(offlineTask, 10000);
-
         // Check URI Mappings
         SparkManager.getChatManager().handleURIMapping(Spark.ARGUMENTS);
     }
@@ -352,7 +338,7 @@ public class Workspace extends JPanel implements PacketListener {
             DelayInformation offlineInformation = (DelayInformation)message.getExtension("x", "jabber:x:delay");
 
             if (offlineInformation != null && (Message.Type.chat == message.getType() || Message.Type.normal == message.getType())) {
-                offlineMessages.add(message);
+                handleOfflineMessage(message);
             }
 
             // Check for anonymous user.