diff --git a/documentation/extensions/intro.html b/documentation/extensions/intro.html
index afe1929dc..522d34412 100644
--- a/documentation/extensions/intro.html
+++ b/documentation/extensions/intro.html
@@ -5,13 +5,46 @@
 </head>
 
 <body>
-  <div class="header">Smack Extensions Manual</div>
-  <p>The XMPP protocol includes a base protocol and many optional extensions. Smack provides the
-  org.jivesoftware.smack package for the core XMPP protocol, and  the org.jivesoftware.smackx package for
-  many of the protocol extensions.</p>
+  	<div class="header">Smack Extensions Manual</div>
+  	<p>The XMPP protocol includes a base protocol and many optional extensions 
+    typically documented as "JEP's". Smack provides the	org.jivesoftware.smack 
+    package for the core XMPP protocol, and  the org.jivesoftware.smackx package for
+  	many of the protocol extensions.</p>
   
-  <p>This manual provides details about each of the "smackx" extensions, including what
-  it is, how to use it, and some simple example code.
+ 	<p>This manual provides details about each of the "smackx" extensions, including what
+  	it is, how to use it, and some simple example code.<p> 
 
+    <div class="subheader">Current Extensions</div><p>
+  
+    <table border="0" width="85%" cellspacing="0" cellpadding="3" style="border:1px #bbb solid;">
+        <tr bgcolor="#ddeeff">
+            <td><b>Name</b></td><td><b>JEP #</b></td><td><b>Description</b></td>
+        </tr>
+        <tr>
+            <td><a href="privatedata.html">Private Data</a></td>
+            <td><a href="http://www.jabber.org/jeps/jep-0049.html">JEP-49</a></td>
+            <td>Manages private data.</td>
+        </tr>
+        <tr>
+            <td><a href="xhtml.html">XHTML Messages</a></td>
+            <td><a href="http://www.jabber.org/jeps/jep-0071.html">JEP-71</a></td>
+            <td>Allows send and receiving formatted messages using XHTML.</td>
+        </tr>
+        <tr>
+            <td><a href="messageevents.html">Message Events</a></td>
+            <td><a href="http://www.jabber.org/jeps/jep-0022.html">JEP-22</a></td>
+            <td>Requests and responds to message events.</td>
+        </tr>
+        <tr>
+            <td><a href="rosterexchange.html">Roster Item Exchange</a></td>
+            <td><a href="http://www.jabber.org/jeps/jep-0093.html">JEP-93</a></td>
+            <td>Allows roster data to be shared between users.</td>
+        </tr>
+        <tr>
+            <td><a href="time.html">Time Exchange</a></td>
+            <td><a href="http://www.jabber.org/jeps/jep-0090.html">JEP-90</a></td>
+            <td>Allows local time information to be shared between users.</td>
+        </tr>
+    </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation/extensions/toc.html b/documentation/extensions/toc.html
index 12e9fe087..5249f2d03 100644
--- a/documentation/extensions/toc.html
+++ b/documentation/extensions/toc.html
@@ -12,10 +12,10 @@
 <div class="subheader">Smack Extensions</div><p>
 
 <a href="privatedata.html">Private Data</a><br>
+<a href="xhtml.html">XHTML Messages</a><br>
 <a href="messageevents.html">Message Events</a><br>
 <a href="rosterexchange.html">Roster Item Exchange</a><br>
 <a href="time.html">Time Exchange</a><br>
-<a href="xhtml.html">XHTML Support</a><br>
 </p>
 
 </body>
diff --git a/documentation/extensions/xhtml.html b/documentation/extensions/xhtml.html
index 94242356c..5efdc1c95 100644
--- a/documentation/extensions/xhtml.html
+++ b/documentation/extensions/xhtml.html
@@ -6,8 +6,10 @@
 
 <body>
 
-<div class="header">XHTML Support</div><p>
-This extension is an XHTML subset for use in exchanging formatted messages.  
+<div class="header">XHTML Messages</div><p>
+
+Provdides the ability to send and receive formatted messages using XHTML.
+
 <p>Follow these links to learn how to compose, send and receive XHTML messages:</p>
 <ul>
   <li><a href="#xhtmlcompose">Compose an XHTML Message</a></li>
@@ -28,6 +30,12 @@ For special situations, advanced users may decide not to use the helper class an
 the XHTML by themselves. Even for these situations Smack provides a well defined entry point 
 in order to add the generated XHTML content to a given message.</p>
 
+<p>
+Note: not all clients are able to view XHTML formatted messages. Therefore,
+it's recommended that you include a normal body in that message that is either an
+unformatted version of the text or a note that XHTML support is required
+to view the message contents.</p> 
+
 <b>Usage</b><p>
 
 Create an instance of <i><b>XHTMLText</b></i> specifying the style and language of the body.

Name	JEP #	Description
Private Data	JEP-49	Manages private data.
XHTML Messages	JEP-71	Allows send and receiving formatted messages using XHTML.
Message Events	JEP-22	Requests and responds to message events.
Roster Item Exchange	JEP-93	Allows roster data to be shared between users.
Time Exchange	JEP-90	Allows local time information to be shared between users.