diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index 7db17978d..499e4e05c 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -925,7 +925,7 @@ public Date getPageFirstMsgTimestamp()
         }
 
         if(firstMessageElement == null)
-            return null;
+            return new Date(Long.MAX_VALUE);
         
         String dateString = (String)firstMessageElement
             .getAttributes().getAttribute("date");
@@ -957,7 +957,7 @@ public Date getPageLastMsgTimestamp()
         }
 
         if(lastMessageElement == null)
-            return null;
+            return new Date(0);
         
         String dateString = (String) lastMessageElement
             .getAttributes().getAttribute("date");