Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.37.2.9 -r1.37.2.10
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	26 May 2016 16:00:31 -0000	1.37.2.9
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	5 Jul 2016 15:46:07 -0000	1.37.2.10
@@ -576,11 +576,19 @@
     if {![info exists timestamp_base]} {set timestamp_base [clock seconds]}
     set age_seconds [expr {$timestamp_base - $timestamp}]
     
+    if {$age_seconds < 0} {
+      set msg_key xowiki.future_interval
+      set age_seconds [expr {0 - $age_seconds}]
+    } else {
+      set msg_key xowiki.ago
+    }
+
     set pos 0
     set msg ""
     my instvar age
     foreach {interval unit unit_plural} $age {
       set base [expr {int($age_seconds / $interval)}]
+
       if {$base > 0} {
         set label [expr {$base == 1 ? $unit : $unit_plural}]
         set localized_label [::lang::message::lookup $locale xowiki.$label]
@@ -599,7 +607,7 @@
           }
         }
         set time $msg
-        set msg [::lang::message::lookup $locale xowiki.ago [list [list time $msg]]]
+        set msg [::lang::message::lookup $locale $msg_key [list [list time $msg]]]
         break
       }
       incr pos