diff --git a/tgp-msg.c b/tgp-msg.c
index 8bc23d7..63b356b 100644
--- a/tgp-msg.c
+++ b/tgp-msg.c
@@ -354,8 +354,9 @@ static void tgp_msg_display (struct tgl_state *TLS, struct tgp_msg_loading *C) {
 
 static time_t tgp_msg_oldest_relevant_ts (struct tgl_state *TLS) {
   connection_data *conn = TLS->ev_base;
-  return tgp_time_n_days_ago (purple_account_get_int (conn->pa, "history-retrieve-days",
-                                 TGP_DEFAULT_HISTORY_RETRIEVAL_THRESHOLD));
+  int days = purple_account_get_int (conn->pa, TGP_KEY_HISTORY_RETRIEVAL_THRESHOLD,
+                                     TGP_DEFAULT_HISTORY_RETRIEVAL_THRESHOLD);
+  return days > 0 ? tgp_time_n_days_ago (days) : 0;
 }
 
 static void tgp_msg_process_ready (struct tgl_state *TLS)
diff --git a/tgp-utils.c b/tgp-utils.c
index 2d0a74a..90abeb6 100644
--- a/tgp-utils.c
+++ b/tgp-utils.c
@@ -91,9 +91,7 @@ tgl_peer_t *tgp_encr_chat_get_partner (struct tgl_state *TLS, struct tgl_secret_
 }
 
 long tgp_time_n_days_ago (int days) {
-  time_t now;
-  time (&now);
-  return now - 24 * 3600 * (time_t)days;
+  return time(NULL) - 24 * 3600 * days;
 };
 
 char *tgp_g_format_size (gint64 size) {