diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 4fe875f9..4e4945ea 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -497,10 +497,13 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
case "list":
modules.commandline.commandOutput(template.tabular(
- ["Host", "Session", "Path", "Value"], ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em"],
+ ["Host", "Expiry (UTC)", "Path", "Name", "Value"],
+ ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em", "max-width: 12em; overflow: hidden;", "padding-left: 1ex;"],
([c.host,
- {c.isSession ? "session" : "persistent"},
+ c.isSession ? session
+ : (new Date(c.expiry * 1000).toJSON() || "Never").replace(/:\d\d\.000Z/, "").replace("T", " ").replace(/-/g, "/"),
c.path,
+ c.name,
c.value]
for (c in Sanitizer.iterCookies(host)))));
return;