diff --git a/mozilla/themes/classic/communicator/formatting.css b/mozilla/themes/classic/communicator/formatting.css
index c42e886680c..fb2052511a9 100644
--- a/mozilla/themes/classic/communicator/formatting.css
+++ b/mozilla/themes/classic/communicator/formatting.css
@@ -44,6 +44,12 @@
     text-decoration       : underline;
   }
   
+.text-link:focus
+  {
+    color                 : red;
+    -moz-outline: 1px dotted invert;
+  }
+
 .text-link:hover
   {
     cursor                : pointer;
diff --git a/mozilla/themes/modern/communicator/formatting.css b/mozilla/themes/modern/communicator/formatting.css
index e3e08c05dc9..170d91e8e95 100644
--- a/mozilla/themes/modern/communicator/formatting.css
+++ b/mozilla/themes/modern/communicator/formatting.css
@@ -49,6 +49,11 @@
   text-decoration: underline;
 }
 
+.text-link:focus {
+  color: red;
+  -moz-outline: 1px dotted invert;
+}
+
 .text-link:hover {
   cursor: pointer;
 }
diff --git a/mozilla/xpfe/global/resources/content/bindings/text.xml b/mozilla/xpfe/global/resources/content/bindings/text.xml
index 175bb93c684..a3388df4673 100644
--- a/mozilla/xpfe/global/resources/content/bindings/text.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/text.xml
@@ -47,5 +47,13 @@
                                     "/>
     </handlers>
   </binding>  
+
+  <binding id="text-link" extends="chrome://global/content/bindings/text.xml#text-label">
+    <handlers>
+     <handler event="keypress" keycode="VK_ENTER" action="this.click()" />
+     <handler event="keypress" keycode="VK_RETURN" action="this.click()" />
+    </handlers>
+  </binding>
+
 </bindings>
 
diff --git a/mozilla/xpfe/global/resources/content/xul.css b/mozilla/xpfe/global/resources/content/xul.css
index e4968b68e51..cec1ebf798a 100644
--- a/mozilla/xpfe/global/resources/content/xul.css
+++ b/mozilla/xpfe/global/resources/content/xul.css
@@ -584,6 +584,11 @@ label {
   -moz-binding: url("chrome://global/content/bindings/text.xml#text-label");
 }
 
+label.text-link {
+  -moz-binding: url("chrome://global/content/bindings/text.xml#text-link");
+  -moz-user-focus: normal;
+}
+
 label[control] {
   -moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
 }