Index: general.ent
===================================================================
--- general.ent	(revision 28655a5c5b30274b8131c8fd343c396ad2ca26a1)
+++ general.ent	(revision 3cd0429cc47d94e6e76043b46c53a7c781da1f4d)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY day          "08">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
@@ -599,5 +599,5 @@
 <!ENTITY thunderbird-version          "2.0.0.6">
 <!ENTITY pan-version                  "0.14.2">
-<!ENTITY balsa-version                "2.3.13">
+<!ENTITY balsa-version                "2.3.22">
 <!ENTITY pidgin-version               "2.1.0">
 <!ENTITY xchat-version                "2.8.4">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 28655a5c5b30274b8131c8fd343c396ad2ca26a1)
+++ introduction/welcome/changelog.xml	(revision 3cd0429cc47d94e6e76043b46c53a7c781da1f4d)
@@ -43,9 +43,18 @@
 
     <listitem>
+      <para>March 8th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Balsa-2.3.22.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 7th, 2008</para>
       <itemizedlist>
         <listitem>
           <para>[ag] - Updated to pcre-7.6. Added the --enable-pcregrep-libbz2
-          and --enable-pcregrep-libz switches. Added in commands explanations
+          and --enable-pcregrep-libz switches. Added in command explanations
           the --enable-unicode-properties switch. Added patch to fix ABI
           breakage.</para>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 28655a5c5b30274b8131c8fd343c396ad2ca26a1)
+++ xsoft/other/balsa.xml	(revision 3cd0429cc47d94e6e76043b46c53a7c781da1f4d)
@@ -7,8 +7,8 @@
   <!ENTITY balsa-download-http "http://balsa.gnome.org/balsa-&balsa-version;.tar.bz2">
   <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "a1c7fe3454243f1719a19fcdb0905948">
-  <!ENTITY balsa-size          "2.4 MB">
-  <!ENTITY balsa-buildsize     "52.2 MB">
-  <!ENTITY balsa-time          "0.7 SBU">
+  <!ENTITY balsa-md5sum        "0f9b8dbdd26a1916dcc92f0767e8b4e4">
+  <!ENTITY balsa-size          "2.5 MB">
+  <!ENTITY balsa-buildsize     "55 MB">
+  <!ENTITY balsa-time          "0.6 SBU">
 ]>
 
@@ -59,29 +59,32 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/>,
-    <xref linkend="libgnomeprintui"/>,
     <xref linkend="scrollkeeper"/>,
-    <xref linkend="aspell"/>, and
-    <xref linkend="gmime"/></para>
+    <xref linkend="gmime"/>, and
+    <xref linkend="aspell"/> or
+    <ulink url="http://gtkspell.sourceforge.net/">GtkSpell</ulink>
+    (<application>GtkSpell</application> provides on-the-fly as you type
+    spell checking)</para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libesmtp"/>
-      (required for outgoing SMTP service)</para>
+    (required for outgoing SMTP service) and
+    <xref linkend="pcre"/></para>
 
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgtkhtml"/>,
+    <para role="optional"><xref linkend="gtkhtml"/>,
     <xref linkend="gtksourceview"/>,
     <xref linkend="openssl"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="pcre"/>,
     <xref linkend="compface"/>,
-    <ulink url="http://gtkspell.sourceforge.net/">GtkSpell</ulink> (provides
-      on-the-fly as you type spell checking),
+    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+    <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink>,
+    <ulink url="http://www.sqlite.org/">SQLite</ulink>, and
     an <xref linkend="server-mail"/> (that provides a
-    <command>sendmail</command> command),
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, and
-    <ulink url="http://www.sqlite.org/">SQLite</ulink></para>
-
-    <bridgehead renderas="sect4">Optional to Build Experimental S/MIME Support</bridgehead>
+    <command>sendmail</command> command, note that it is only used if you
+    didn't install the recommended <application>libESMTP</application>
+    package)</para>
+
+    <bridgehead renderas="sect4">Optional to Build S/MIME Support</bridgehead>
     <para role="optional">
     <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink>
@@ -102,6 +105,5 @@
             --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --mandir=$(pkg-config --variable=prefix \
-                    ORBit-2.0)/share/man \
+            --with-rubrica \
             --with-gtkhtml=no &amp;&amp;
 make</userinput></screen>
@@ -127,6 +129,6 @@
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
+    <para><parameter>--with-rubrica</parameter>: This parameter is used
+    to provide Rubrica2 address book support.</para>
 
     <para><parameter>--with-gtkhtml=no</parameter>: This parameter is used if
@@ -135,5 +137,5 @@
     read or write HTML formatted mail messages if you use this parameter.</para>
 
-    <para><parameter>--with-esmtp=no</parameter>: Use this parameter if
+    <para><option>--with-esmtp=no</option>: Use this parameter if
     you don't have <application>libESMTP</application> installed.</para>
 
