Log dates in all history files as ISO 8601 with timezone

17 files changed, 56 insertions, 56 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
index c3c3d4d..f952785 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/AdHocChatRoomIcqImpl.java
@@ -433,7 +433,7 @@ public class AdHocChatRoomIcqImpl
             AdHocChatRoomMessageDeliveredEvent msgDeliveredEvt =
                 new AdHocChatRoomMessageDeliveredEvent(
                     this,
-                    System.currentTimeMillis(),
+                    new Date(),
                     message,
                     AdHocChatRoomMessageDeliveredEvent.CONVERSATION_MESSAGE_DELIVERED);
 
@@ -594,7 +594,7 @@ public class AdHocChatRoomIcqImpl
                 new AdHocChatRoomMessageReceivedEvent(
                     chatRoom,
                     participants.get(participantUID),
-                    System.currentTimeMillis(),
+                    new Date(),
                     newMessage,
                     AdHocChatRoomMessageReceivedEvent
                         .CONVERSATION_MESSAGE_RECEIVED);
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
index 68e6905..af4f12c 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetBasicInstantMessagingIcqImpl.java
@@ -71,15 +71,6 @@ public class OperationSetBasicInstantMessagingIcqImpl
     private static final int MAX_MSG_LEN = 2047;
 
     /**
-     * I do not why but we sometimes receive messages with a date in the future.sdf
-     * I've decided to ignore such messages. I draw the line on
-     * currentTimeMillis() + ONE_DAY milliseconds. Anything with a date farther
-     * in the future is considered bogus and its date is replaced with current
-     * time millis.
-     */
-    private static final long ONE_DAY = 86400001;
-
-    /**
      * KeepAlive interval for sending packets
      */
     private final static long KEEPALIVE_INTERVAL = 180000l; // 3 minutes
@@ -270,10 +261,13 @@ public class OperationSetBasicInstantMessagingIcqImpl
                 //reason that I currently don't know. Until we find it
                 //(which may well be never) we are putting in an agly hack
                 //ignoring messages with a date beyond tomorrow.
-                long current = System.currentTimeMillis();
-                long msgDate = offlineMsgCmd.getDate().getTime();
+                Date current = new Date();
+                Date msgDate = offlineMsgCmd.getDate();
 
-                if( (current + ONE_DAY) > msgDate )
+                Calendar tomorrow = new GregorianCalendar();
+                tomorrow.setTime(current);
+                tomorrow.set(Calendar.DATE, tomorrow.get(Calendar.DATE) + 1);
+                if( tomorrow.after(msgDate) )
                     msgDate = current;
 
                 MessageReceivedEvent msgReceivedEvt
@@ -557,10 +551,13 @@ public class OperationSetBasicInstantMessagingIcqImpl
             //reason that I currently don't know. Until we find it
             //(which may well be never) we are putting in an agly hack
             //ignoring messages with a date beyond tomorrow.
-            long current = System.currentTimeMillis();
-            long msgDate = minfo.getTimestamp().getTime();
+            Date current = new Date();
+            Date msgDate = minfo.getTimestamp();
 
-            if ( (current + ONE_DAY) > msgDate)
+            Calendar tomorrow = new GregorianCalendar();
+            tomorrow.setTime(current);
+            tomorrow.set(Calendar.DATE, tomorrow.get(Calendar.DATE) + 1);
+            if ( tomorrow.after(msgDate))
                 msgDate = current;
 
 
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
index bf03ba4..65f6071 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java
@@ -809,7 +809,7 @@ public class ChatRoomIrcImpl
 
         ChatRoomMessageDeliveredEvent msgDeliveredEvt
             = new ChatRoomMessageDeliveredEvent(this,
-                                                System.currentTimeMillis(),
+                                                new Date(),
                                                 msg,
                                                 eventType);
 
@@ -838,7 +838,7 @@ public class ChatRoomIrcImpl
      */
     public void fireMessageReceivedEvent(   Message message,
                                             ChatRoomMember fromMember,
-                                            long date,
+                                            Date date,
                                             int eventType)
     {
         ChatRoomMessageReceivedEvent event
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
index 3cca772..405555e 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -241,7 +241,7 @@ public class IrcStack
         chatRoom.fireMessageReceivedEvent(
             message,
             sourceMember,
-            System.currentTimeMillis(),
+            new Date(),
             ChatRoomMessageReceivedEvent.CONVERSATION_MESSAGE_RECEIVED);
     }
 
@@ -297,7 +297,7 @@ public class IrcStack
         chatRoom.fireMessageReceivedEvent(
             message,
             sourceMember,
-            System.currentTimeMillis(),
+            new Date(),
             ChatRoomMessageReceivedEvent.CONVERSATION_MESSAGE_RECEIVED);
     }
 
@@ -345,7 +345,7 @@ public class IrcStack
         chatRoom.fireMessageReceivedEvent(
             actionMessage,
             sourceMember,
-            System.currentTimeMillis(),
+            new Date(),
             ChatRoomMessageReceivedEvent.ACTION_MESSAGE_RECEIVED);
     }
 
@@ -666,7 +666,7 @@ public class IrcStack
         chatRoom.fireMessageReceivedEvent(
                 message,
                 sourceMember,
-                System.currentTimeMillis(),
+                new Date(),
                 ChatRoomMessageReceivedEvent.ACTION_MESSAGE_RECEIVED);
     }
 
@@ -1251,7 +1251,7 @@ public class IrcStack
             serverRoom.fireMessageReceivedEvent(
                     message,
                     serverMember,
-                    System.currentTimeMillis(),
+                    new Date(),
                     ChatRoomMessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
         }
     }
@@ -1830,7 +1830,7 @@ public class IrcStack
         chatRoom.fireMessageReceivedEvent(
             message,
             ircMUCOpSet.findSystemMember(),
-            System.currentTimeMillis(),
+            new Date(),
             ChatRoomMessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
     }
 
@@ -2057,7 +2057,7 @@ public class IrcStack
         privateChatRoom.fireMessageReceivedEvent(
             queryMessage,
             sourceMember,
-            System.currentTimeMillis(),
+            new Date(),
             ChatRoomMessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
     }
 }
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
index 1c51d7d..07d6f5b 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
@@ -765,7 +765,7 @@ public class ChatRoomJabberImpl
              ChatRoomMessageDeliveredEvent msgDeliveredEvt
                  = new ChatRoomMessageDeliveredEvent(
                      this,
-                     System.currentTimeMillis(),
+                     new Date(),
                      message,
                      ChatRoomMessageDeliveredEvent
                          .CONVERSATION_MESSAGE_DELIVERED);
@@ -1587,18 +1587,18 @@ public class ChatRoomJabberImpl
             org.jivesoftware.smack.packet.Message msg
                 = (org.jivesoftware.smack.packet.Message) packet;
 
-            long timeStamp;
+            Date timeStamp;
 
             DelayInformation delay =
                 (DelayInformation)msg.getExtension("x", "jabber:x:delay");
 
             if(delay != null)
             {
-                timeStamp = delay.getStamp().getTime();
+                timeStamp = delay.getStamp();
             }
             else
             {
-                timeStamp = System.currentTimeMillis();
+                timeStamp = new Date();
             }
 
             String msgBody = msg.getBody();
@@ -2376,7 +2376,7 @@ public class ChatRoomJabberImpl
                     = new ChatRoomMessageReceivedEvent(
                         ChatRoomJabberImpl.this,
                         member,
-                        System.currentTimeMillis(),
+                        new Date(),
                         createMessage(msgBody),
                         messageReceivedEventType);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
index 1b90491..d619aa8 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
@@ -751,18 +751,18 @@ public class OperationSetBasicInstantMessagingJabberImpl
                     .createVolatileContact(fromUserID);
             }
 
-            long timestamp = System.currentTimeMillis();
+            Date timestamp = new Date();
             //Check for XEP-0091 timestamp (deprecated)
             PacketExtension delay = msg.getExtension("x", "jabber:x:delay");
             if(delay != null && delay instanceof DelayInformation)
             {
-                timestamp = ((DelayInformation)delay).getStamp().getTime();
+                timestamp = ((DelayInformation)delay).getStamp();
             }
             //check for XEP-0203 timestamp
             delay = msg.getExtension("delay", "urn:xmpp:delay");
             if(delay != null && delay instanceof DelayInfo)
             {
-                timestamp = ((DelayInfo)delay).getStamp().getTime();
+                timestamp = ((DelayInfo)delay).getStamp();
             }
             MessageReceivedEvent msgReceivedEvt = new MessageReceivedEvent(
                     newMessage, sourceContact, timestamp, correctedMessageUID);
@@ -979,7 +979,7 @@ public class OperationSetBasicInstantMessagingJabberImpl
                 newMail, HTML_MIME_TYPE, DEFAULT_MIME_ENCODING, null);
 
             MessageReceivedEvent msgReceivedEvt = new MessageReceivedEvent(
-                newMailMessage, sourceContact, System.currentTimeMillis(),
+                newMailMessage, sourceContact, new Date(),
                 MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
 
             fireMessageEvent(msgReceivedEvt);
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockBasicInstantMessaging.java b/src/net/java/sip/communicator/impl/protocol/mock/MockBasicInstantMessaging.java
index 62c5266..67a4778 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockBasicInstantMessaging.java
@@ -6,6 +6,8 @@
  */
 package net.java.sip.communicator.impl.protocol.mock;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 
@@ -67,7 +69,7 @@ public class MockBasicInstantMessaging
         IllegalArgumentException
     {
         fireMessageEvent(
-            new MessageDeliveredEvent(message, to, System.currentTimeMillis()));
+            new MessageDeliveredEvent(message, to, new Date()));
     }
 
     /**
@@ -113,6 +115,6 @@ public class MockBasicInstantMessaging
 
         fireMessageEvent(
             new MessageReceivedEvent(
-                    msg, sourceContact, System.currentTimeMillis()));
+                    msg, sourceContact, new Date()));
     }
 }
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java b/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
index 61360fc..d86f7e8 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockChatRoom.java
@@ -459,7 +459,7 @@ public class MockChatRoom
         ChatRoomMessageDeliveredEvent evt = 
             new ChatRoomMessageDeliveredEvent(
                     this,
-                    System.currentTimeMillis(),
+                    new Date(),
                     message,
                     ChatRoomMessageDeliveredEvent
                         .CONVERSATION_MESSAGE_DELIVERED);
@@ -517,7 +517,7 @@ public class MockChatRoom
             new ChatRoomMessageReceivedEvent(
                     this,
                     fromMember,
-                    System.currentTimeMillis(),
+                    new Date(),
                     msg,
                     ChatRoomMessageReceivedEvent
                         .CONVERSATION_MESSAGE_RECEIVED);
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/AdHocChatRoomMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/AdHocChatRoomMsnImpl.java
index 15b54cd..ccf7eee 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/AdHocChatRoomMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/AdHocChatRoomMsnImpl.java
@@ -411,7 +411,7 @@ public class AdHocChatRoomMsnImpl
         AdHocChatRoomMessageDeliveredEvent msgDeliveredEvt
             = new AdHocChatRoomMessageDeliveredEvent(
             this,
-            System.currentTimeMillis(),
+            new Date(),
             message,
             AdHocChatRoomMessageDeliveredEvent.CONVERSATION_MESSAGE_DELIVERED);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
index cabb176..d7c8fab 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
@@ -483,7 +483,7 @@ implements OperationSetAdHocMultiUserChat
                 new AdHocChatRoomMessageReceivedEvent(
                     chatRoom,
                     participant,
-                    System.currentTimeMillis(),
+                    new Date(),
                     newMessage,
                     AdHocChatRoomMessageReceivedEvent
                     .CONVERSATION_MESSAGE_RECEIVED);
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
index b137682..2b5a651 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
@@ -244,7 +244,7 @@ public class OperationSetBasicInstantMessagingMsnImpl
 
             MessageReceivedEvent msgReceivedEvt
                 = new MessageReceivedEvent(
-                    newMessage, sourceContact , System.currentTimeMillis() );
+                    newMessage, sourceContact , new Date());
     
             // msgReceivedEvt = messageReceivedTransform(msgReceivedEvt);
             
@@ -283,7 +283,7 @@ public class OperationSetBasicInstantMessagingMsnImpl
 
             MessageReceivedEvent msgReceivedEvt
                 = new MessageReceivedEvent(
-                    newMessage, sourceContact , System.currentTimeMillis() );
+                    newMessage, sourceContact , new Date());
 
             fireMessageEvent(msgReceivedEvt);
         }
@@ -366,7 +366,7 @@ public class OperationSetBasicInstantMessagingMsnImpl
                  = new MessageReceivedEvent(
                      newMailMessage,
                      sourceContact,
-                     System.currentTimeMillis(),
+                     new Date(),
                      MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
 
              fireMessageEvent(msgReceivedEvt);
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
index c53e78a..098003b 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
@@ -186,7 +186,7 @@ public class OperationSetBasicInstantMessagingRssImpl
                 new MessageReceivedEvent(
                         createMessage(news),
                         rssContact,
-                        System.currentTimeMillis()));
+                        new Date()));
         }
         else if(userRequestedUpdate)
         {
@@ -195,7 +195,7 @@ public class OperationSetBasicInstantMessagingRssImpl
                 new MessageReceivedEvent(
                         createMessage(news),
                         rssContact,
-                        System.currentTimeMillis()));
+                        new Date()));
         }
     }
 
@@ -305,7 +305,7 @@ public class OperationSetBasicInstantMessagingRssImpl
             DEFAULT_MIME_TYPE, DEFAULT_MIME_ENCODING, null);
 
         fireMessageEvent(
-            new MessageDeliveredEvent(msg, to, System.currentTimeMillis()));
+            new MessageDeliveredEvent(msg, to, new Date()));
 
         threadedContactFeedUpdate((ContactRssImpl)to);
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
index a623198..0f07af4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicInstantMessagingSipImpl.java
@@ -745,7 +745,7 @@ public class OperationSetBasicInstantMessagingSipImpl
             // fire an event
             MessageReceivedEvent msgReceivedEvt
                 = new MessageReceivedEvent(
-                        newMessage, from, System.currentTimeMillis());
+                        newMessage, from, new Date());
             fireMessageEvent(msgReceivedEvt);
 
             return true;
@@ -906,7 +906,7 @@ public class OperationSetBasicInstantMessagingSipImpl
                 // we delivered the message
                 MessageDeliveredEvent msgDeliveredEvt
                     = new MessageDeliveredEvent(
-                            newMessage, to, System.currentTimeMillis());
+                            newMessage, to, new Date());
 
                 fireMessageEvent(msgDeliveredEvt);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
index 92adb28..9cc0fe5 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetBasicInstantMessagingSSHImpl.java
@@ -13,6 +13,7 @@
 package net.java.sip.communicator.impl.protocol.ssh;
 
 import java.io.*;
+import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
@@ -273,7 +274,7 @@ public class OperationSetBasicInstantMessagingSSHImpl
             new MessageReceivedEvent(
                     message,
                     from,
-                    System.currentTimeMillis(),
+                    new Date(),
                     ((ContactSSH) from).getMessageType()));
     }
     
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
index 2f91be1..2fb1000 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
@@ -378,7 +378,7 @@ public class AdHocChatRoomYahooImpl
             AdHocChatRoomMessageDeliveredEvent msgDeliveredEvt
                 = new AdHocChatRoomMessageDeliveredEvent(
                     this,
-                    System.currentTimeMillis(),
+                    new Date(),
                     message,
                     ChatRoomMessageDeliveredEvent.CONVERSATION_MESSAGE_DELIVERED);
 
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
index 57895c2..ed36592 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
@@ -666,7 +666,7 @@ implements OperationSetAdHocMultiUserChat
                         new AdHocChatRoomMessageReceivedEvent(
                             chatRoom,
                             member,
-                            System.currentTimeMillis(),
+                            new Date(),
                             newMessage,
                             AdHocChatRoomMessageReceivedEvent
                             .CONVERSATION_MESSAGE_RECEIVED);
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
index 7c453db..175316c 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
@@ -152,7 +152,7 @@ public class OperationSetBasicInstantMessagingYahooImpl
 
             MessageDeliveredEvent msgDeliveryPendingEvt
             = new MessageDeliveredEvent(
-                    message, to, System.currentTimeMillis());
+                    message, to, new Date());
 
             msgDeliveryPendingEvt = messageDeliveryPendingTransform(msgDeliveryPendingEvt);
             
@@ -192,7 +192,7 @@ public class OperationSetBasicInstantMessagingYahooImpl
                 
                 MessageDeliveredEvent msgDeliveredEvt
                 = new MessageDeliveredEvent(
-                        message, to, System.currentTimeMillis());
+                        message, to, new Date());
                 
                 // msgDeliveredEvt = messageDeliveredTransform(msgDeliveredEvt);
                 
@@ -402,7 +402,7 @@ public class OperationSetBasicInstantMessagingYahooImpl
             }
             MessageReceivedEvent msgReceivedEvt
                 = new MessageReceivedEvent(
-                    newMailMessage, sourceContact, System.currentTimeMillis(),
+                    newMailMessage, sourceContact, new Date(),
                     MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
 
             fireMessageEvent(msgReceivedEvt);
@@ -455,7 +455,7 @@ public class OperationSetBasicInstantMessagingYahooImpl
 
              MessageReceivedEvent msgReceivedEvt
              = new MessageReceivedEvent(
-                 newMessage, sourceContact , System.currentTimeMillis() );
+                 newMessage, sourceContact , new Date());
 
              // msgReceivedEvt = messageReceivedTransform(msgReceivedEvt);