diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 55e15727d9b4de07906068ca50056cd174116c1d..1ddda2d823910707a93d2fda1fec74ffa5aa7e7e 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1491,10 +1491,12 @@ public class DataHelper {
             return (ms / (60 * 1000)) + "m";
         } else if (ms < 3 * 24 * 60 * 60 * 1000) {
             return (ms / (60 * 60 * 1000)) + "h";
-        } else if (ms > 1000l * 24l * 60l * 60l * 1000l) {
-            return "n/a";
-        } else {
+        } else if (ms < 1000L * 24 * 60 * 60 * 1000) {
             return (ms / (24 * 60 * 60 * 1000)) + "d";
+        } else if (ms < 1000L * 365 * 24 * 60 * 60 * 1000) {
+            return (ms / (365L * 24 * 60 * 60 * 1000)) + "y";
+        } else {
+            return "n/a";
         }
     }
     
@@ -1537,11 +1539,14 @@ public class DataHelper {
             // hours
             // alternates: hrs, hr., hrs.
             t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
-        } else if (ams > 1000l * 24l * 60l * 60l * 1000l) {
-            return _("n/a");
-        } else {
+        } else if (ams < 1000L * 24 * 60 * 60 * 1000) {
             // days
             t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
+        } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
+            // years
+            t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
+        } else {
+            return _("n/a");
         }
         // Replace minus sign to work around
         // bug in Chrome (and IE?), line breaks at the minus sign
@@ -1581,10 +1586,14 @@ public class DataHelper {
             t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
         } else if (ams < 2 * 24 * 60 * 60 * 1000) {
             t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
-        } else if (ams > 1000l * 24l * 60l * 60l * 1000l) {
-            return _("n/a");
-        } else {
+        } else if (ams < 1000L * 24 * 60 * 60 * 1000) {
+            // days
             t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
+        } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
+            // years
+            t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
+        } else {
+            return _("n/a");
         }
         if (ms < 0)
             t = t.replace("-", "&minus;");