1 files changed, 3 insertions, 2 deletions

diff --git a/kmicromail/libetpan/generic/mhdriver_message.c b/kmicromail/libetpan/generic/mhdriver_message.c
index 2c023e7..aafd2d9 100644
--- a/kmicromail/libetpan/generic/mhdriver_message.c
+++ b/kmicromail/libetpan/generic/mhdriver_message.c
@@ -99,98 +99,99 @@ static int mh_prefetch(mailmessage * msg_info)
                              &msg_content, &msg_length);
   if (r != MAIL_NO_ERROR)
     return r;
 
   msg = msg_info->msg_data;
 
   msg->msg_message = msg_content;
   msg->msg_length = msg_length;
 
   return MAIL_NO_ERROR;
 }
 
 static void mh_prefetch_free(struct generic_message_t * msg)
 {
   if (msg->msg_message != NULL) {
     mmap_string_unref(msg->msg_message);
     msg->msg_message = NULL;
   }
 }
 
 static inline struct mh_session_state_data * get_data(mailmessage * msg)
 {
   return msg->msg_session->sess_data;
 }
 
 static inline struct mailmh_folder * get_mh_cur_folder(mailmessage * msg)
 {
   return get_data(msg)->mh_cur_folder;
 }
 
 static int mh_initialize(mailmessage * msg_info)
 {
   struct generic_message_t * msg;
   int r;
   char * uid;
   char static_uid[PATH_MAX];
   struct mailmh_msg_info * mh_msg_info;
   chashdatum key;
   chashdatum value;
   
   key.data = &msg_info->msg_index;
   key.len = sizeof(msg_info->msg_index);
   r = chash_get(get_mh_cur_folder(msg_info)->fl_msgs_hash, &key, &value);
   if (r < 0)
     return MAIL_ERROR_INVAL;
   
   mh_msg_info = value.data;
   
-  snprintf(static_uid, PATH_MAX, "%u-%lu-%u", msg_info->msg_index,
-           mh_msg_info->msg_mtime, mh_msg_info->msg_size);
+  snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
+           (unsigned long) mh_msg_info->msg_mtime,
+      (unsigned long) mh_msg_info->msg_size);
   uid = strdup(static_uid);
   if (uid == NULL)
     return MAIL_ERROR_MEMORY;
 
   r = mailmessage_generic_initialize(msg_info);
   if (r != MAIL_NO_ERROR) {
     free(uid);
     return r;
   }
 
   msg = msg_info->msg_data;
   msg->msg_prefetch = mh_prefetch;
   msg->msg_prefetch_free = mh_prefetch_free;
   msg_info->msg_uid = uid;
 
   return MAIL_NO_ERROR;
 }
 
      
 static int mh_fetch_size(mailmessage * msg_info,
                          size_t * result)
 {
   int r;
   size_t size;
 
   r = mhdriver_fetch_size(msg_info->msg_session, msg_info->msg_index, &size);
   if (r != MAIL_NO_ERROR)
     return r;
   
   * result = size;
 
   return MAIL_NO_ERROR;
 }
 
 
 
 
 static int mh_fetch_header(mailmessage * msg_info,
                            char ** result,
                            size_t * result_len)
 {
   struct generic_message_t * msg;
   int r;
   char * msg_content;
   size_t msg_length;
 
   msg = msg_info->msg_data;
   if (msg->msg_message != NULL) {