diff --git a/etc/venice-config.xml b/etc/venice-config.xml
index ada24f6..45934b4 100644
--- a/etc/venice-config.xml
+++ b/etc/venice-config.xml
@@ -359,15 +359,18 @@ Here is the password reminder for your account "${username}" as you requested:
 ${reminder}
 
 If this reminder is not sufficient for you to remember what your password is,
-then the system can change your password for you.  To do so, please visit the following URL:
+then the system can change your password for you.  To do so, please visit
+the following URL:
 
 http://delenn/venice/passrecovery/${change.uid}.${change.auth}
 
-Your password will be changed and a new password will be E-mailed to you at this address.
+Your password will be changed and a new password will be E-mailed to you
+at this address.
 
-If you did NOT request a password reminder, then this message was sent by someone
-attempting to access your account without your knowledge.  Do not panic!  Nothing has
-happened to your account or password yet, but please do notify the system administrator.
+If you did NOT request a password reminder, then this message was sent
+by someone attempting to access your account without your knowledge.  Do
+not panic!  Nothing has happened to your account or password yet, but
+please do notify the system administrator.
 
 -- The Management
     ]]></reminder>
@@ -375,13 +378,15 @@ happened to your account or password yet, but please do notify the system admini
     <reminder-subject>Venice Password Reminder Message</reminder-subject>
 
     <password-change><![CDATA[
-The password for your account "${username}" has been changed.  The new password is "${password}".
+The password for your account "${username}" has been changed.  The new
+password is "${password}".
 
-You should log into Venice immediately and change the password to something else.  You can change the
-password for your account, once you are logged in, by clicking on the "Profile" link in the top bar.
+You should log into Venice immediately and change the password to something
+else.  You can change the password for your account, once you are logged in,
+by clicking on the "Profile" link in the top bar.
 
-If you did NOT request a password change on your account, please notify the system administrator
-IMMEDIATELY.
+If you did NOT request a password change on your account, please notify the
+system administrator IMMEDIATELY.
 
 -- The Management
     ]]></password-change>
@@ -393,12 +398,14 @@ IMMEDIATELY.
                      personal = personal message, fullname = name of inviter,
                      username = user name of inviter -->
     <invite-public><![CDATA[
-Hi! I would like to invite you to join the "${community.name}" community on the Venice conferencing system.
-To do so, you must register as a user, which is absolutely free!  Just point your Web browser at
-<http://delenn/venice/sig/${community.alias}> and click the "Create Account" link at the top of the page,
-or click the "Log In" link if you already have a Venice account.  Once you have completed the process,
-click the "Join Now" button.  You will then be able to take part in the conferences that are going on in
-the community.
+Hi! I would like to invite you to join the "${community.name}" community on
+the Venice conferencing system.  To do so, you must register as a user, which
+is absolutely free!  Just point your Web browser at
+<http://delenn/venice/sig/${community.alias}> and click the "Create Account"
+link at the top of the page, or click the "Log In" link if you already have
+a Venice account.  Once you have completed the process, click the "Join Now"
+button.  You will then be able to take part in the conferences that are
+going on in the community.
 
 ${personal}
 
@@ -412,12 +419,15 @@ Hope to see you in "${community.name}" soon!
                      joinkey = join key for community, personal = personal message,
                      fullname = name of inviter, username = user name of inviter -->
     <invite-private><![CDATA[
-Hi! I would like to invite you to join the "${community.name}" community on the Venice conferencing system.
-To do so, you must register as a user, which is absolutely free!  Just point your Web browser at
-<http://delenn/venice/sig/${community.alias}> and click the "Create Account" link at the top of the page,
-or click the "Log In" link if you already have a Venice account.  Once you have completed the process,
-click the "Join Now" button.  You will be prompted for the "password" for this community, which is
-"${joinkey}". You will then be able to take part in the conferences that are going on in the community.
+Hi! I would like to invite you to join the "${community.name}" community on
+the Venice conferencing system.  To do so, you must register as a user, which
+is absolutely free!  Just point your Web browser at
+<http://delenn/venice/sig/${community.alias}> and click the "Create Account"
+link at the top of the page, or click the "Log In" link if you already have
+a Venice account.  Once you have completed the process, click the "Join Now"
+button.  You will be prompted for the "password" for this community, which is
+"${joinkey}". You will then be able to take part in the conferences that are
+going on in the community.
 
 ${personal}
 
@@ -433,18 +443,20 @@ Hope to see you in "${community.name}" soon!
     <!-- What to add above the "personal" message for a conference-specific invite. -->
     <!-- Parameters: community.name, conference.name -->
     <add-conf-invite><![CDATA[
-After you've joined the "${community.name}" community, check out the "${conference.name}" conference.
-To find it, after joining the community, click "Conferences" on the left menu bar, then click on the
+After you've joined the "${community.name}" community, check out the
+"${conference.name}" conference.  To find it, after joining the community,
+click "Conferences" on the left menu bar, then click on the
 "${conference.name}" conference name in the conference list.
     ]]></add-conf-invite>
 
     <!-- What to add above the "personal" message for a topic-specific invite. -->
     <!-- Parameters: community.name, conference.name, topic.name -->
     <add-topic-invite><![CDATA[
-After you've joined the "${community.name}" community, check out the "${topic.name}" topic in the
-"${conference.name}" conference.  To find it, after joining the community, click "Conferences" on the
-left menu bar, then click on the "${conference.name}" conference name in the conference list, then click
-on the "${topic.name}" topic name in the topic list.
+After you've joined the "${community.name}" community, check out the
+"${topic.name}" topic in the "${conference.name}" conference.  To find it,
+after joining the community, click "Conferences" on the left menu bar, then
+click on the "${conference.name}" conference name in the conference list,
+then click on the "${topic.name}" topic name in the topic list.
     ]]></add-topic-invite>
 
     <!-- Template used for E-mailing posts to users (top half of E-mail) -->
@@ -474,50 +486,58 @@ click the "Manage" button, and click the "Stop Subscribing To This Topic" link.
     <!-- Mass mail notification reminder for communities -->
     <!-- Parameters: community.name -->
     <mass-community-notice><![CDATA[
-You are receiving this message because you are a member of the Venice community "${community.name}".
-The sender is a host of this community.  To stop receiving mass E-mailed notices from all
-Venice community and conference hosts, visit Venice, click on the "Profile" link, check the box labeled
-"Don't send me mass E-mail from community/conference hosts," and click Update to save this preference.
+You are receiving this message because you are a member of the Venice
+community "${community.name}". The sender is a host of this community.
+To stop receiving mass E-mailed notices from all Venice community and
+conference hosts, visit Venice, click on the "Profile" link, check the box
+labeled "Don't send me mass E-mail from community/conference hosts," and
+click Update to save this preference.
     ]]></mass-community-notice>
 
     <!-- Mass mail notification reminder for conference posters -->
     <!-- Parameters: community.name, conference.name -->
     <mass-conference-notice-poster><![CDATA[
-You are receiving this message because you are a participant in the "${conference.name}" conference
-in the Venice community "${community.name}".  The sender is a host of this conference.  To stop receiving
-mass E-mailed notices from all Venice community and conference hosts, visit Venice, click on the "Profile"
-link, check the box labeled "Don't send me mass E-mail from community/conference hosts," and click Update
-to save this preference.
+You are receiving this message because you are a participant in the
+"${conference.name}" conference in the Venice community "${community.name}".
+The sender is a host of this conference.  To stop receiving mass E-mailed
+notices from all Venice community and conference hosts, visit Venice, click
+on the "Profile" link, check the box labeled "Don't send me mass E-mail from
+community/conference hosts," and click Update to save this preference.
     ]]></mass-conference-notice-poster>
 
     <!-- Mass mail notification reminder for conference readers -->
     <!-- Parameters: community.name, conference.name -->
     <mass-conference-notice-reader><![CDATA[
-You are receiving this message because you are a reader of the "${conference.name}" conference
-in the Venice community "${community.name}".  The sender is a host of this conference.  To stop receiving
-mass E-mailed notices from all Venice community and conference hosts, visit Venice, click on the "Profile"
-link, check the box labeled "Don't send me mass E-mail from community/conference hosts," and click Update
-to save this preference.
+You are receiving this message because you are a reader of the
+"${conference.name}" conference in the Venice community "${community.name}".
+The sender is a host of this conference.  To stop receiving mass E-mailed
+notices from all Venice community and conference hosts, visit Venice, click
+on the "Profile" link, check the box labeled "Don't send me mass E-mail from
+community/conference hosts," and click Update to save this preference.
     ]]></mass-conference-notice-reader>
 
     <!-- Mass mail notification reminder for topic posters -->
     <!-- Parameters: community.name, conference.name, topic.name -->
     <mass-topic-notice-poster><![CDATA[
-You are receiving this message because you are a participant in the "${topic.name}" topic in the
-"${conference.name}" conference in the Venice community "${community.name}".  The sender is a host of the
-"${conference.name}" conference.  To stop receiving mass E-mailed notices from all Venice community and
-conference hosts, visit Venice, click on the "Profile" link, check the box labeled "Don't send me mass
-E-mail from community/conference hosts," and click Update to save this preference.
+You are receiving this message because you are a participant in the
+"${topic.name}" topic in the "${conference.name}" conference in the Venice
+community "${community.name}".  The sender is a host of the
+"${conference.name}" conference.  To stop receiving mass E-mailed notices
+from all Venice community and conference hosts, visit Venice, click on the
+"Profile" link, check the box labeled "Don't send me mass E-mail from
+community/conference hosts," and click Update to save this preference.
     ]]></mass-topic-notice-poster>
 
     <!-- Mass mail notification reminder for topic readers -->
     <!-- Parameters: community.name, conference.name, topic.name -->
     <mass-topic-notice-reader><![CDATA[
-You are receiving this message because you are a reader of the "${topic.name}" topic in the
-"${conference.name}" conference in the Venice community "${community.name}".  The sender is a host of the
-"${conference.name}" conference.  To stop receiving mass E-mailed notices from all Venice community and
-conference hosts, visit Venice, click on the "Profile" link, check the box labeled "Don't send me mass
-E-mail from community/conference hosts," and click Update to save this preference.
+You are receiving this message because you are a reader of the "${topic.name}"
+topic in the "${conference.name}" conference in the Venice community
+"${community.name}".  The sender is a host of the "${conference.name}"
+conference.  To stop receiving mass E-mailed notices from all Venice
+community and conference hosts, visit Venice, click on the "Profile" link,
+check the box labeled "Don't send me mass E-mail from community/conference
+hosts," and click Update to save this preference.
     ]]></mass-topic-notice-reader>
 
   </messages>