diff --git a/src/config.h b/src/config.h
index c0d690b3..693e948a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -12,9 +12,9 @@
 #define PROGNAME "piler"
 #define PILERGETD_PROGNAME "pilergetd"
 
-#define VERSION "0.1.25-rc1"
+#define VERSION "0.1.25-master-branch"
 
-#define BUILD 870
+#define BUILD 871
 
 #define HOSTID "mailarchiver"
 
@@ -57,6 +57,7 @@
 #define MEMCACHED_MSGS_DUPLICATE MEMCACHED_CLAPF_PREFIX "duplicate"
 #define MEMCACHED_MSGS_IGNORE MEMCACHED_CLAPF_PREFIX "ignore"
 #define MEMCACHED_MSGS_SIZE MEMCACHED_CLAPF_PREFIX "size"
+#define MEMCACHED_MSGS_STORED_SIZE MEMCACHED_CLAPF_PREFIX "stored_size"
 
 
 #define LOG_PRIORITY LOG_INFO
diff --git a/src/counters.c b/src/counters.c
index 78cc89a4..20fc429d 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -17,7 +17,7 @@ struct __counters load_counters(struct session_data *sdata, struct __data *data,
 
    bzero(&counters, sizeof(counters));
 
-   snprintf(buf, SMALLBUFSIZE-1, "SELECT `rcvd`, `virus`, `duplicate`, `ignore`, `size` FROM `%s`", SQL_COUNTER_TABLE);
+   snprintf(buf, SMALLBUFSIZE-1, "SELECT `rcvd`, `virus`, `duplicate`, `ignore`, `size`, `stored_size` FROM `%s`", SQL_COUNTER_TABLE);
 
 
    if(prepare_sql_statement(sdata, &(data->stmt_generic), buf) == ERR) return counters;
@@ -34,6 +34,7 @@ struct __counters load_counters(struct session_data *sdata, struct __data *data,
       data->sql[data->pos] = (char *)&counters.c_duplicate; data->type[data->pos] = TYPE_LONGLONG; data->len[data->pos] = sizeof(uint64); data->pos++;
       data->sql[data->pos] = (char *)&counters.c_ignore; data->type[data->pos] = TYPE_LONGLONG; data->len[data->pos] = sizeof(uint64); data->pos++;
       data->sql[data->pos] = (char *)&counters.c_size; data->type[data->pos] = TYPE_LONGLONG; data->len[data->pos] = sizeof(uint64); data->pos++;
+      data->sql[data->pos] = (char *)&counters.c_stored_size; data->type[data->pos] = TYPE_LONGLONG; data->len[data->pos] = sizeof(uint64); data->pos++;
 
       p_store_results(sdata, data->stmt_generic, data);
       p_fetch_results(data->stmt_generic);
@@ -65,11 +66,12 @@ void update_counters(struct session_data *sdata, struct __data *data, struct __c
          if(counters->c_duplicate > 0) memcached_increment(&(data->memc), MEMCACHED_MSGS_DUPLICATE, strlen(MEMCACHED_MSGS_DUPLICATE), counters->c_duplicate, &mc);
          if(counters->c_ignore > 0) memcached_increment(&(data->memc), MEMCACHED_MSGS_IGNORE, strlen(MEMCACHED_MSGS_IGNORE), counters->c_ignore, &mc);
          if(counters->c_size > 0) memcached_increment(&(data->memc), MEMCACHED_MSGS_SIZE, strlen(MEMCACHED_MSGS_SIZE), counters->c_size, &mc);
+         if(counters->c_stored_size > 0) memcached_increment(&(data->memc), MEMCACHED_MSGS_STORED_SIZE, strlen(MEMCACHED_MSGS_STORED_SIZE), counters->c_stored_size, &mc);
 
 
          bzero(&c, sizeof(c)); 
 
-         snprintf(buf, MAXBUFSIZE-1, "%s %s %s %s %s %s", MEMCACHED_MSGS_RCVD, MEMCACHED_MSGS_VIRUS, MEMCACHED_MSGS_DUPLICATE, MEMCACHED_MSGS_IGNORE, MEMCACHED_MSGS_SIZE, MEMCACHED_COUNTERS_LAST_UPDATE);
+         snprintf(buf, MAXBUFSIZE-1, "%s %s %s %s %s %s %s", MEMCACHED_MSGS_RCVD, MEMCACHED_MSGS_VIRUS, MEMCACHED_MSGS_DUPLICATE, MEMCACHED_MSGS_IGNORE, MEMCACHED_MSGS_SIZE, MEMCACHED_MSGS_STORED_SIZE, MEMCACHED_COUNTERS_LAST_UPDATE);
 
          if(memcached_mget(&(data->memc), buf) == MEMCACHED_SUCCESS){
             while((memcached_fetch_result(&(data->memc), &key[0], &buf[0], &flags))){
@@ -78,6 +80,7 @@ void update_counters(struct session_data *sdata, struct __data *data, struct __c
                else if(!strcmp(key, MEMCACHED_MSGS_DUPLICATE)) c.c_duplicate = strtoull(buf, NULL, 10);
                else if(!strcmp(key, MEMCACHED_MSGS_IGNORE)) c.c_ignore = strtoull(buf, NULL, 10);
                else if(!strcmp(key, MEMCACHED_MSGS_SIZE)) c.c_size = strtoull(buf, NULL, 10);
+               else if(!strcmp(key, MEMCACHED_MSGS_STORED_SIZE)) c.c_stored_size = strtoull(buf, NULL, 10);
                else if(!strcmp(key, MEMCACHED_COUNTERS_LAST_UPDATE)) mc = strtoull(buf, NULL, 10);
             }
 
@@ -85,7 +88,7 @@ void update_counters(struct session_data *sdata, struct __data *data, struct __c
             if(sdata->now - mc > cfg->memcached_to_db_interval && c.c_rcvd > 0 && c.c_rcvd >= rcvd){
                snprintf(buf, SMALLBUFSIZE-1, "%ld", sdata->now); memcached_set(&(data->memc), MEMCACHED_COUNTERS_LAST_UPDATE, strlen(MEMCACHED_COUNTERS_LAST_UPDATE), buf, strlen(buf), 0, 0);
 
-               snprintf(buf, SMALLBUFSIZE-1, "UPDATE `%s` SET `rcvd`=%llu, `virus`=%llu, `duplicate`=%llu, `ignore`=%llu, `size`=%llu", SQL_COUNTER_TABLE, c.c_rcvd, c.c_virus, c.c_duplicate, c.c_ignore, c.c_size);
+               snprintf(buf, SMALLBUFSIZE-1, "UPDATE `%s` SET `rcvd`=%llu, `virus`=%llu, `duplicate`=%llu, `ignore`=%llu, `size`=%llu, `stored_size`=%llu", SQL_COUNTER_TABLE, c.c_rcvd, c.c_virus, c.c_duplicate, c.c_ignore, c.c_size, c.c_stored_size);
  
                //if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: update counters: %s", sdata->ttmpfile, buf);
 
@@ -105,12 +108,13 @@ void update_counters(struct session_data *sdata, struct __data *data, struct __c
          snprintf(buf, SMALLBUFSIZE-1, "%llu", c.c_duplicate + counters->c_duplicate); memcached_add(&(data->memc), MEMCACHED_MSGS_DUPLICATE, strlen(MEMCACHED_MSGS_DUPLICATE), buf, strlen(buf), 0, 0);
          snprintf(buf, SMALLBUFSIZE-1, "%llu", c.c_ignore + counters->c_ignore); memcached_add(&(data->memc), MEMCACHED_MSGS_IGNORE, strlen(MEMCACHED_MSGS_IGNORE), buf, strlen(buf), 0, 0);
          snprintf(buf, SMALLBUFSIZE-1, "%llu", c.c_size + counters->c_size); memcached_add(&(data->memc), MEMCACHED_MSGS_SIZE, strlen(MEMCACHED_MSGS_SIZE), buf, strlen(buf), 0, 0);
+         snprintf(buf, SMALLBUFSIZE-1, "%llu", c.c_stored_size + counters->c_stored_size); memcached_add(&(data->memc), MEMCACHED_MSGS_STORED_SIZE, strlen(MEMCACHED_MSGS_STORED_SIZE), buf, strlen(buf), 0, 0);
       }
 
    }
    else {
 #endif
-      snprintf(buf, SMALLBUFSIZE-1, "UPDATE `%s` SET `rcvd`=`rcvd`+%llu, `virus`=`virus`+%llu, `duplicate`=`duplicate`+%llu, `ignore`=`ignore`+%llu, `size`=`size`+%llu", SQL_COUNTER_TABLE, counters->c_rcvd, counters->c_virus, counters->c_duplicate, counters->c_ignore, counters->c_size);
+      snprintf(buf, SMALLBUFSIZE-1, "UPDATE `%s` SET `rcvd`=`rcvd`+%llu, `virus`=`virus`+%llu, `duplicate`=`duplicate`+%llu, `ignore`=`ignore`+%llu, `size`=`size`+%llu, `stored_size`=`stored_size`+%llu", SQL_COUNTER_TABLE, counters->c_rcvd, counters->c_virus, counters->c_duplicate, counters->c_ignore, counters->c_size, counters->c_stored_size);
       p_query(sdata, buf);
 
 #ifdef HAVE_MEMCACHED
diff --git a/src/defs.h b/src/defs.h
index 38960e92..ca40ebb1 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -319,6 +319,7 @@ struct __counters {
    unsigned long long c_duplicate;
    unsigned long long c_ignore;
    unsigned long long c_size;
+   unsigned long long c_stored_size;
 };
 
 #endif /* _DEFS_H */
diff --git a/util/db-mysql.sql b/util/db-mysql.sql
index 7ca9b617..68a86b83 100644
--- a/util/db-mysql.sql
+++ b/util/db-mysql.sql
@@ -149,10 +149,11 @@ create table if not exists `counter` (
    `virus` bigint unsigned default 0,
    `duplicate` bigint unsigned default 0,
    `ignore` bigint unsigned default 0,
-   `size` bigint unsigned default 0
+   `size` bigint unsigned default 0,
+   `stored_size` bigint unsigned default 0
 ) Engine=InnoDB;
 
-insert into `counter` values(0, 0, 0, 0, 0);
+insert into `counter` values(0, 0, 0, 0, 0, 0);
 
 
 create table if not exists `option` (
diff --git a/util/db-upgrade-0.1.24-vs-0.1.25.sql b/util/db-upgrade-0.1.24-vs-0.1.25.sql
index c25190ac..630c86c6 100644
--- a/util/db-upgrade-0.1.24-vs-0.1.25.sql
+++ b/util/db-upgrade-0.1.24-vs-0.1.25.sql
@@ -29,6 +29,9 @@ create table if not exists `autosearch` (
 ) Engine=InnoDB;
 
 
+alter table `counter` add column `stored_size` bigint unsigned default 0;
+
+
 create unique index `entry` on archiving_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`);
 
 create unique index `entry` on retention_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`);