diff -up mutt-1.10.1/hcache.c.mutt-1.9.3-1_coverity_81_82_83 mutt-1.10.1/hcache.c
--- mutt-1.10.1/hcache.c.mutt-1.9.3-1_coverity_81_82_83	2018-10-25 15:24:29.323623566 +0200
+++ mutt-1.10.1/hcache.c	2018-10-25 15:27:41.932438843 +0200
@@ -842,7 +842,7 @@ mutt_hcache_fetch_raw (header_cache_t *h
 
   return data.data;
 #else
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   ksize = strlen (h->folder) + keylen (path + strlen (h->folder));  
@@ -944,7 +944,7 @@ mutt_hcache_store_raw (header_cache_t* h
 
   return h->db->put(h->db, NULL, &key, &databuf, 0);
 #else
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -1042,7 +1042,7 @@ mutt_hcache_delete(header_cache_t *h, co
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -1100,7 +1100,7 @@ mutt_hcache_delete(header_cache_t *h, co
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -1161,7 +1161,7 @@ mutt_hcache_delete(header_cache_t *h, co
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@ -1211,7 +1211,7 @@ mutt_hcache_delete(header_cache_t *h, co
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
 
   key.dptr = path;
@@ -1417,7 +1417,7 @@ mutt_hcache_delete(header_cache_t *h, co
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
+  strfcpy(path, h->folder, sizeof (path));
   safe_strcat(path, sizeof (path), filename);
   ksize = strlen (h->folder) + keylen (path + strlen (h->folder));