diff --git a/docs/VERSION.txt b/docs/VERSION.txt
index e3c8c12..e820d6d 100644
--- a/docs/VERSION.txt
+++ b/docs/VERSION.txt
@@ -1,6 +1,7 @@
 0.356
 --
 
+* Timestamps work again
 * Logging works
 * Multiple styles in BrowseEdit
 * More font-tweaking
diff --git a/plugins/Tk-Convo/Milkbone/Convo.pm b/plugins/Tk-Convo/Milkbone/Convo.pm
index 6dc3fd8..a32d292 100644
--- a/plugins/Tk-Convo/Milkbone/Convo.pm
+++ b/plugins/Tk-Convo/Milkbone/Convo.pm
@@ -208,6 +208,8 @@ sub init
     $self->{bottom}->bind("<Control-Return>", [sub { $self->{bottom}->insert('insert', "\r\n")}, $self]);
     $self->{bottom}->bind("<KeyPress>", [$self, "on_key"]);
     $self->bind("<F2>", [$self, "toggle_stamps"]);
+    $self->{bottom}->bind("<F2>", [$self, "toggle_stamps"]);
+    $self->{top}->bind("<F2>", [$self, "toggle_stamps"]);
 
     hook("tk_bindwheel", -window => $self->{bottom});
     hook("tk_bindwheel", -window => $self->{top});
diff --git a/plugins/Tk-GUI/Tk/BrowseEdit.pm b/plugins/Tk-GUI/Tk/BrowseEdit.pm
index 4366612..69d8336 100644
--- a/plugins/Tk-GUI/Tk/BrowseEdit.pm
+++ b/plugins/Tk-GUI/Tk/BrowseEdit.pm
@@ -1,14 +1,15 @@
 #
 #
-#  WARNING - THIS IS CHEWBACCA CODE - IT DOES NOT MAKE SENSE.  DO NOT MAKE ANY CHANGES TO THIS FILE,
-#  FOR IT FUNCTIONS IF AND ONLY IF THE CODE IS EXACTLY AS IT IS AND EVEN THEN ONLY WORKS
-#  PROPERLY DURING A FULL MOON ON THE THIRD THURSRDAY OF ODD-NUMBERED MONTHS IN THE SPRING WHEN THERE'S
-#  SNOW ON THE GROUND.
+#  WARNING - THIS IS CHEWBACCA CODE - IT DOES NOT MAKE SENSE.  DO NOT MAKE ANY 
+#  CHANGES TO THIS FILE, FOR IT FUNCTIONS IF AND ONLY IF THE CODE IS EXACTLY 
+#  AS IT IS AND EVEN THEN ONLY WORKS PROPERLY DURING A FULL MOON ON THE THIRD 
+#  THURSRDAY OF ODD-NUMBERED MONTHS IN THE SPRING WHEN THERE'S SNOW ON THE 
+#  GROUND.
 #
-#  YOU HAVE BEEN WARNED.  DO NOT BLAME ME IF THIS CODE DOES NOT WORK, EATS YOUR CHILDREN, OR FAXES
-#  HUNDREDS OF COPIES OF ITSELF TO GUAM.
+#  YOU HAVE BEEN WARNED.  DO NOT BLAME ME IF THIS CODE DOES NOT WORK, EATS 
+#  YOUR CHILDREN, OR FAXES HUNDREDS OF COPIES OF ITSELF TO GUAM.
 #
-#  IT DOES NOT MAKE SENSE!!!!  (Look at the monkey, look at the silly monkey...)
+#  IT DOES NOT MAKE SENSE!!!! (Look at the monkey, look at the silly monkey...)
 #
 #  - batkins (8-21-03)
 #