diff --git a/include/mod_offline.hrl b/include/mod_offline.hrl
index c4c70604a..cc644c4c2 100644
--- a/include/mod_offline.hrl
+++ b/include/mod_offline.hrl
@@ -1,7 +1,7 @@
 -record(offline_msg,
 	{us = {<<"">>, <<"">>} :: {binary(), binary()},
-	 timestamp = now()     :: erlang:timestamp() | '_',
-	 expire = now()        :: erlang:timestamp() | never | '_',
+	 timestamp = p1_time_compat:timestamp() :: erlang:timestamp() | '_',
+	 expire = p1_time_compat:timestamp() :: erlang:timestamp() | never | '_',
 	 from = #jid{}         :: jid() | '_',
 	 to = #jid{}           :: jid() | '_',
 	 packet = #xmlel{}     :: xmlel() | '_'}).