diff -ru horde/imp/templates/common-header.inc horde-changed/imp/templates/common-header.inc
--- horde/imp/templates/common-header.inc	2004-12-21 11:35:18.000000000 +0330
+++ horde-changed/imp/templates/common-header.inc	2005-05-03 13:30:05.000000000 +0430
@@ -47,5 +47,5 @@
 <?php if (!empty($ie_clientcaps)): ?><style>IE\:clientcaps {behavior:url(#default#clientcaps)}</style><?php endif; ?>
 </head>
 
-<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; if (!empty($nls['rtl'][$language])) echo ' style="direction:rtl"'; ?>>
+<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; if (!empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) echo ' style="direction:rtl"'; ?>>
 <?php if (!empty($ie_clientcaps)): ?><IE:clientcaps ID="objCCaps" /><?php endif; ?>
diff -ru horde/imp/templates/compose/attachments.inc horde-changed/imp/templates/compose/attachments.inc
--- horde/imp/templates/compose/attachments.inc	2005-03-20 16:17:18.000000000 +0330
+++ horde-changed/imp/templates/compose/attachments.inc	2005-05-03 16:21:00.000000000 +0430
@@ -1,6 +1,6 @@
 <tr>
-  <td align="left"><img src="<?php echo $viewer->getIcon($mime->getType()) ?>" height="16" width="16" border="0" alt="[Icon]" />&nbsp;</td>
-  <td align="left"><strong><?php echo ($file_num) ?>. <?php echo $mime->getName(true, true) ?></strong>&nbsp;&nbsp;(<?php echo $mime->getType() ?>)&nbsp;&nbsp;&nbsp;<strong><?php echo _("Size") ?>:</strong>&nbsp;<?php echo $mime->getSize() ?> KB<?php if (isset($preview_url)): ?>&nbsp;&nbsp;&nbsp;[<?php echo Horde::link($preview_url, _("Preview") . ' ' . $mime->getName(), 'link', 'compose_preview_window') . _("Preview") ?></a>]<?php endif; ?></td>
+  <td class="leftAlign"><img src="<?php echo $viewer->getIcon($mime->getType()) ?>" height="16" width="16" border="0" alt="[Icon]" />&nbsp;</td>
+  <td class="leftAlign"><strong><?php echo ($file_num) ?>. <?php echo $mime->getName(true, true) ?></strong>&nbsp;&nbsp;(<?php echo $mime->getType() ?>)&nbsp;&nbsp;&nbsp;<strong><?php echo _("Size") ?>:</strong>&nbsp;<?php echo $mime->getSize() ?> KB<?php if (isset($preview_url)): ?>&nbsp;&nbsp;&nbsp;[<?php echo Horde::link($preview_url, _("Preview") . ' ' . $mime->getName(), 'link', 'compose_preview_window') . _("Preview") ?></a>]<?php endif; ?></td>
 </tr>
 
 <tr>
@@ -8,8 +8,8 @@
   <td>
     <table border="0" width="100%" cellpadding="0">
       <tr>
-        <td align="left" valign="middle"><strong><?php echo _("Disposition") ?>:</strong>&nbsp;</td>
-        <td align="left">
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Disposition") ?>:</strong>&nbsp;</td>
+        <td class="leftAlign">
           <select name="file_disposition_<?php echo $file_num ?>">
             <option value="attachment"<?php if ($disposition == 'attachment') echo ' selected="selected"' ?>><?php echo _("Attachment") ?></option>
             <option value="inline"<?php if ($disposition == 'inline') echo ' selected="selected"' ?>><?php echo _("Inline") ?></option>
@@ -18,15 +18,15 @@
       </tr>
 
       <tr>
-        <td align="left" valign="middle"><strong><?php echo _("Description") ?>:</strong>&nbsp;</td>
-        <td align="left">
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Description") ?>:</strong>&nbsp;</td>
+        <td class="leftAlign">
           <input type="text" size="40" name="file_description_<?php echo $file_num ?>" value="<?php echo $mime->getDescription() ?>" />
         </td>
       </tr>
 
       <tr>
-        <td align="left" valign="middle"><strong><?php echo _("Delete") ?>?</strong>&nbsp;</td>
-        <td align="left"><input type="checkbox" name="delattachments[]" value="<?php echo $file_num ?>" /></td>
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Delete") ?>?</strong>&nbsp;</td>
+        <td class="leftAlign"><input type="checkbox" name="delattachments[]" value="<?php echo $file_num ?>" /></td>
       </tr>
     </table>
   </td>
diff -ru horde/imp/templates/compose/compose.inc horde-changed/imp/templates/compose/compose.inc
--- horde/imp/templates/compose/compose.inc	2005-04-28 04:53:21.000000000 +0430
+++ horde-changed/imp/templates/compose/compose.inc	2005-05-04 10:33:07.000000000 +0430
@@ -95,14 +95,14 @@
     <?php endif; ?>
           </td>
 <?php else: ?>
-    <td class="light" align="right"><strong><?php echo _("From") ?>&nbsp;</strong></td>
+    <td class="light rightAlign"><strong><?php echo _("From") ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
 <?php if (!$prefs->isLocked('from_addr')): ?>
-          <td align="left"><input type="text" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="from" value="<?php echo htmlspecialchars($from) ?>" style="direction:ltr"/></td>
+          <td class="leftAlign"><input type="text" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="from" value="<?php echo htmlspecialchars($from) ?>" style="direction:ltr"/></td>
 <?php else: ?>
-          <td align="left"><strong>&nbsp;<?php echo htmlspecialchars($from) ?></strong></td>
+          <td class="leftAlign"><strong>&nbsp;<?php echo htmlspecialchars($from) ?></strong></td>
 <?php endif; ?>
 <?php endif; ?>
           <td class="rightAlign"><?php echo Help::link('imp', 'compose-from') ?>&nbsp;</td>
@@ -112,14 +112,14 @@
   </tr>
 
   <tr>
-    <td class="light" align="right" valign="middle"><strong><?php echo Horde::label('to', _("_To")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('to', _("_To")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['to'])): $first_to = true; ?>
 <?php foreach ($header['to'] as $to_item): ?>
         <tr>
 <?php if (count($to_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table cellspacing="0">
               <tr>
                 <td width="350">
@@ -137,7 +137,7 @@
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" style="direction:ltr"/></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" style="direction:ltr"/></td>
 <?php endif; ?>
 <?php if ($first_to): $first_to = false; ?>
           <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
@@ -147,7 +147,7 @@
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" style="direction:ltr" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" style="direction:ltr" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
@@ -162,14 +162,14 @@
 
 <?php if ($conf['compose']['allow_cc']): ?>
   <tr>
-    <td class="light" align="right" valign="middle"><strong><?php echo Horde::label('cc', _("_Cc")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('cc', _("_Cc")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['cc'])): $first_cc = true; ?>
 <?php foreach ($header['cc'] as $cc_item): ?>
         <tr>
 <?php if (count($cc_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table cellspacing="0">
               <tr>
                 <td width="350">
@@ -187,7 +187,7 @@
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[]" value="<?php echo htmlspecialchars($cc_item) ?>" style="direction:ltr" /></td>
+          <td class="leftAlign"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[]" value="<?php echo htmlspecialchars($cc_item) ?>" style="direction:ltr" /></td>
 <?php endif; ?>
 <?php if ($first_cc): $first_cc = false; ?>
           <td class="rightAlign"><?php echo Help::link('imp', 'compose-cc') ?>&nbsp;</td>
@@ -197,7 +197,7 @@
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_new" style="direction:ltr" /></td>
+          <td class="leftAlign"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_new" style="direction:ltr" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
@@ -213,14 +213,14 @@
 
 <?php if ($conf['compose']['allow_bcc']): ?>
   <tr>
-    <td class="light" align="right" valign="middle"><strong><?php echo Horde::label('bcc', _("_Bcc")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('bcc', _("_Bcc")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['bcc'])): $first_bcc = true; ?>
 <?php foreach ($header['bcc'] as $bcc_item): ?>
         <tr>
 <?php if (count($bcc_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table cellspacing="0">
               <tr>
                 <td width="350">
@@ -238,7 +238,7 @@
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[]" value="<?php echo htmlspecialchars($bcc_item) ?>" style="direction:ltr" /></td>
+          <td class="leftAlign"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[]" value="<?php echo htmlspecialchars($bcc_item) ?>" style="direction:ltr" /></td>
 <?php endif; ?>
 <?php if ($first_bcc): $first_bcc = false; ?>
           <td class="rightAlign"><?php echo Help::link('imp', 'compose-bcc') ?>&nbsp;</td>
@@ -248,7 +248,7 @@
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_new" style="direction:ltr" /></td>
+          <td class="leftAlign"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_new" style="direction:ltr" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
@@ -263,7 +263,7 @@
 <?php endif; ?>
 
   <tr>
-    <td class="light" align="right" valign="middle"><strong><?php echo Horde::label('subject', _("S_ubject")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('subject', _("S_ubject")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
@@ -280,7 +280,7 @@
 ?>
 <?php if ($set_priority || !$locked_charset): ?>
   <tr>
-    <td class="light" valign="middle" align="right"><strong><?php echo ($locked_charset) ? Horde::label('priority', _("_Priority")) : Horde::label('charset', _("C_harset")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="middle"><strong><?php echo ($locked_charset) ? Horde::label('priority', _("_Priority")) : Horde::label('charset', _("C_harset")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
@@ -297,9 +297,9 @@
 <?php if ($set_priority): ?>
 <?php $priority = substr(Util::getFormData('x_priority', '3'), 0, 1); ?>
 <?php if (!$locked_charset): ?>
-          <td align="right" valign="middle"><?php echo Horde::label('priority', _("_Priority")) ?>&nbsp;</td>
+          <td class="rightAlign" valign="middle"><?php echo Horde::label('priority', _("_Priority")) ?>&nbsp;</td>
 <?php endif; ?>
-          <td align="left">
+          <td class="leftAlign">
             <select id="priority" name="x_priority" tabindex="<?php echo $tabindex++ ?>">
               <option value="1 (Highest)"<?php if ($priority == '1)') echo ' selected="selected"' ?>>1 (<?php echo _("Highest") ?>)</option>
               <option value="2 (High)"<?php if ($priority == '2') echo ' selected="selected"' ?>>2 (<?php echo _("High") ?>)</option>
@@ -387,7 +387,7 @@
                 <td colspan="2">
                   <table width="100%" cellspacing="0">
                     <tr>
-                      <td valign="middle" class="item" align="left" width="20px">
+                      <td valign="middle" class="item leftAlign" width="20px">
                         <?php echo Horde::img('compose.png', _("Switch Composition Method"), 'align="middle"') ?>
                       </td>
                       <td class="item leftAlign" valign="middle">
@@ -407,7 +407,7 @@
   </tr>
 
   <tr>
-    <td class="light" align="right" valign="top"><strong><?php echo Horde::label('message', _("Te_xt")) ?>&nbsp;</strong></td>
+    <td class="light rightAlign" valign="top"><strong><?php echo Horde::label('message', _("Te_xt")) ?>&nbsp;</strong></td>
     <td class="item">
       <textarea class="composebody" tabindex="<?php echo $tabindex++ ?>" name="message" id="message" rows="20" cols="80"><?php echo htmlspecialchars($msg) ?></textarea>
     </td>
@@ -429,7 +429,7 @@
         </tr>
 <?php if ($prefs->getValue('use_pgp') || $prefs->getValue('use_smime')): ?>
         <tr>
-          <td class="item" nowrap="nowrap" align="left">
+          <td class="item leftAlign" nowrap="nowrap">
             &nbsp;<?php echo Horde::label('encrypt_options', _("Encr_yption Options")) ?>:&nbsp;
             <select id="encrypt_options" name="encrypt_options">
 <?php
@@ -442,7 +442,7 @@
         </tr>
 <?php if ($prefs->getValue('use_pgp') && $prefs->getValue('pgp_public_key')): ?>
         <tr>
-          <td class="item" nowrap="nowrap" align="left">
+          <td class="item leftAlign" nowrap="nowrap">
             <input id="pap" type="checkbox" name="pgp_attach_pubkey" <?php if (Util::getFormData('pgp_attach_pubkey', $prefs->getValue('pgp_attach_pubkey'))) echo 'checked="checked" ' ?>/>
             <?php echo Horde::label('pap', _("Attach a copy of your PGP public key to your message?")) ?>
           </td>
@@ -475,12 +475,12 @@
       <table width="100%">
         <tr>
 <?php if (!$imp_compose->maxAttachmentSize()): ?>
-          <td align="left" colspan="2">
+          <td class="leftAlign" colspan="2">
             <?php echo _("Maximum total attachment size reached.") ?>
             <input type="hidden" name="submitBtn7" />
           </td>
 <?php else: if (!isset($attachments)): ?>
-          <td align="left" colspan="2">
+          <td class="leftAlign" colspan="2">
             <?php echo _("Maximum number of attachments reached.") ?>
             <input type="hidden" name="submitBtn7" />
           </td>
@@ -488,10 +488,10 @@
           <td class="leftAlign">
             <table>
               <tr id="attachment_row_1">
-                <td align="left">
+                <td class="leftAlign">
                   <strong><?php echo _("File") ?> 1:</strong>&nbsp;<input name="upload_1" tabindex="<?php echo $tabindex++ ?>" type="file" onchange="attachmentChanged()" size="25" class="fixed" style="direction:ltr" />
                 </td>
-                <td align="left">
+                <td class="leftAlign">
                   <select name="upload_disposition_1">
                     <option value="attachment" selected="selected"><?php echo _("Attachment") ?></option>
                     <option value="inline"><?php echo _("Inline") ?></option>
@@ -525,8 +525,8 @@
     <td class="item">
       <table width="100%" cellspacing="2">
         <tr>
-          <td align="left" valign="middle"><strong><?php echo _("Save Attachments with message in sent-mail folder?") ?></strong>&nbsp;</td>
-          <td align="left">
+          <td class="leftAlign" valign="middle"><strong><?php echo _("Save Attachments with message in sent-mail folder?") ?></strong>&nbsp;</td>
+          <td class="leftAlign">
             <select name="save_attachments_select">
               <option value="1"<?php if ($save_attach_val == 1) echo ' selected="selected"' ?>><?php echo _("Yes") ?></option>
               <option value="0"<?php if ($save_attach_val == 0) echo ' selected="selected"' ?>><?php echo _("No") ?></option>
@@ -543,7 +543,7 @@
     <td class="item">
       <table width="100%">
         <tr>
-          <td align="left">
+          <td class="leftAlign">
             <table class="item" cellspacing="2">
 <?php
     $mime_contents = &new MIME_Contents(new MIME_Part());
@@ -564,7 +564,7 @@
                 <td>&nbsp;</td>
               </tr>
               <tr>
-                <td colspan="4" align="left"><strong><?php echo _("Total Attachments Size:") ?></strong> <?php echo number_format($imp_compose->sizeOfAttachments() / 1024, 2, $localeinfo['decimal_point'], '') ?> <?php echo _("KB") ?></th>
+                <td colspan="4" class="leftAlign"><strong><?php echo _("Total Attachments Size:") ?></strong> <?php echo number_format($imp_compose->sizeOfAttachments() / 1024, 2, $localeinfo['decimal_point'], '') ?> <?php echo _("KB") ?></th>
               </tr>
               <tr>
                 <td colspan="4">
diff -ru horde/imp/templates/compose/recompose.inc horde-changed/imp/templates/compose/recompose.inc
--- horde/imp/templates/compose/recompose.inc	2005-03-20 16:17:18.000000000 +0330
+++ horde-changed/imp/templates/compose/recompose.inc	2005-05-03 15:42:06.000000000 +0430
@@ -7,22 +7,22 @@
 </tr>
 
 <tr>
-  <td width="5%" class="light" align="right" valign="top"><strong><?php echo _("To") ?></strong>&nbsp;</td>
+  <td width="5%" class="light rightAlign" valign="top"><strong><?php echo _("To") ?></strong>&nbsp;</td>
   <td width="95%" class="text"><?php echo htmlspecialchars(_getFormData('to')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><strong><?php echo _("Cc") ?></strong>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Cc") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('cc')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><strong><?php echo _("Bcc") ?></strong>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Bcc") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('bcc')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><strong><?php echo _("Subject") ?></strong>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Subject") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('subject')) ?></td>
 </tr>
 
diff -ru horde/imp/templates/compose/redirect.inc horde-changed/imp/templates/compose/redirect.inc
--- horde/imp/templates/compose/redirect.inc	2005-03-22 02:09:22.000000000 +0430
+++ horde-changed/imp/templates/compose/redirect.inc	2005-05-03 15:40:57.000000000 +0430
@@ -58,14 +58,14 @@
 <?php endif; ?>
 
 <tr>
-  <td class="light" align="right" valign="middle"><strong><?php echo Horde::label('to', _("To")) ?>&nbsp;</strong></td>
-  <td class="item" align="left">
+  <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('to', _("To")) ?>&nbsp;</strong></td>
+  <td class="item leftAlign">
       <table border="0" width="100%" cellpadding="0">
 <?php if (is_array($header['to'])): $first_to = true; ?>
 <?php foreach ($header['to'] as $to_item): ?>
         <tr>
 <?php if (count($to_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table border="0" cellspacing="0" cellpadding="0">
               <tr>
                 <td width="350">
@@ -83,23 +83,23 @@
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" /></td>
 <?php endif; ?>
 <?php if ($first_to): $first_to = false; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
 <?php else: ?>
           <td>&nbsp;</td>
 <?php endif; ?>
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this)" /><span id="expandingto" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>'; ?></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this)" /><span id="expandingto" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>'; ?></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
       </table>
diff -ru horde/imp/templates/pgp/import_key.inc horde-changed/imp/templates/pgp/import_key.inc
--- horde/imp/templates/pgp/import_key.inc	2005-03-20 16:17:20.000000000 +0330
+++ horde-changed/imp/templates/pgp/import_key.inc	2005-05-03 16:15:44.000000000 +0430
@@ -26,17 +26,17 @@
 
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
  <tr>
-  <td align="left" class="header" nowrap="nowrap"><?php echo $title ?></td>
+  <td class="header leftAlign" nowrap="nowrap"><?php echo $title ?></td>
  </tr>
 
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left"><strong><?php echo $insert_text ?>:</strong></td>
+     <td class="item leftAlign"><strong><?php echo $insert_text ?>:</strong></td>
     </tr>
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <textarea name="import_key" rows="6" cols="80" class="fixed"></textarea>
      </td>
     </tr>
@@ -45,14 +45,14 @@
  </tr>
 
  <tr>
-  <td class="item" align="left"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
+  <td class="item leftAlign"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
  </tr>
 
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <strong><?php echo _("Upload") ?>:</strong>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
      </td>
     </tr>
diff -ru horde/imp/templates/smime/import_key.inc horde-changed/imp/templates/smime/import_key.inc
--- horde/imp/templates/smime/import_key.inc	2005-03-21 07:30:28.000000000 +0330
+++ horde-changed/imp/templates/smime/import_key.inc	2005-05-03 16:18:01.000000000 +0430
@@ -31,13 +31,13 @@
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php if (isset($insert_text)): ?>
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left"><strong><?php echo $insert_text ?>:</strong></td>
+     <td class="item leftAlign"><strong><?php echo $insert_text ?>:</strong></td>
     </tr>
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <textarea name="import_key" rows="6" cols="80" class="fixed"></textarea>
      </td>
     </tr>
@@ -46,15 +46,15 @@
  </tr>
 
  <tr>
-  <td class="item" align="left"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
+  <td class="item leftAlign"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
  </tr>
 <?php endif; ?>
 
  <tr>
-  <td class="item" align="left"<?php if ($certimport): ?> colspan="2"<?php endif; ?>>
+  <td class="item leftAlign"<?php if ($certimport): ?> colspan="2"<?php endif; ?>>
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <strong><?php echo _("Upload") ?>:</strong>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
      </td>
     </tr>
@@ -64,15 +64,15 @@
 
 <?php if ($certimport): ?>
  <tr>
-  <td class="item" align="left" colspan="2">
+  <td class="item leftAlign" colspan="2">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <strong><?php echo _("Password") ?>:</strong>&nbsp;<input name="upload_key_pass" type="password" size="30" class="fixed" />
      </td>
     </tr>
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <strong><?php echo _("Private Key Password") ?>:</strong>&nbsp;<input name="upload_key_pk_pass" type="password" size="30" class="fixed" />
      </td>
     </tr>
diff -ru horde/templates/admin/groups/addchild.inc horde-changed/templates/admin/groups/addchild.inc
--- horde/templates/admin/groups/addchild.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/groups/addchild.inc	2005-05-03 17:51:33.000000000 +0430
@@ -5,8 +5,8 @@
 
 <table border="0" width="100%" cellpadding="1" cellspacing="1">
   <tr>
-    <td class="header" align="left" width="100%">
-      <span class="smallheader"><?php echo Horde::img('group.png') ?>&nbsp;<?php echo sprintf(_("Add a child group to '%s'"), $gname) ?></span>
+    <td class="header leftAlign" width="100%">
+      <span class="smallheader"><?php echo Horde::img(isset($nls['rtl'][$language]) ? 'rev-group.png' : 'group.png') ?>&nbsp;<?php echo sprintf(_("Add a child group to '%s'"), $gname) ?></span>
     </td>
   </tr><tr>
     <td>
diff -ru horde/templates/admin/setup/config.html horde-changed/templates/admin/setup/config.html
--- horde/templates/admin/setup/config.html	2004-10-06 06:06:46.000000000 +0330
+++ horde-changed/templates/admin/setup/config.html	2005-05-03 16:25:03.000000000 +0430
@@ -8,7 +8,7 @@
   <tr class="smallheader">
     <td>
       <gettext>Generated Code</gettext>
-    </td><td align="right">
+    </td><td class="rightAlign">
       <tag:diff_popup />
     </td>
   </tr><tr class="light">
diff -ru horde/templates/admin/user/noadd.inc horde-changed/templates/admin/user/noadd.inc
--- horde/templates/admin/user/noadd.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/noadd.inc	2005-05-03 14:00:18.000000000 +0430
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Adding users is disabled.") ?>
     </td>
   </tr><tr>
-    <td align="left" class="control">
+    <td class="control leftAlign">
       <?php echo _("Your authentication backend does not support adding users, or the feature has been disabled for some other reason.") ?>
     </td>
   </tr>
diff -ru horde/templates/admin/user/nolist.inc horde-changed/templates/admin/user/nolist.inc
--- horde/templates/admin/user/nolist.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/nolist.inc	2005-05-03 13:58:27.000000000 +0430
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Listing users is disabled.") ?>
     </td>
   </tr><tr>
-    <td align="left" class="control">
+    <td class="control leftAlign">
       <?php echo _("Your authentication backend does not support listing users, or the feature has been disabled for some other reason.") ?>
     </td>
   </tr>
diff -ru horde/templates/admin/user/remove.inc horde-changed/templates/admin/user/remove.inc
--- horde/templates/admin/user/remove.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/remove.inc	2005-05-03 14:00:53.000000000 +0430
@@ -3,7 +3,7 @@
 
 <table border="0" cellspacing="0" cellpadding="2">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php printf(_("Remove user: %s"), $f_user_name) ?>
     </td>
   </tr><tr>
@@ -11,7 +11,7 @@
       <strong><?php printf(_("Really delete %s? This operation cannot be undone."), $f_user_name) ?></strong>
     </td>
   </tr><tr>
-    <td class="smallheader" align="right">
+    <td class="smallheader rightAlign">
       <input type="submit" class="button" name="submit" value="<?php echo _("Remove user") ?>" />
       <input type="submit" class="button" name="submit" value="<?php echo _("Cancel") ?>" />
     </td>
diff -ru horde/templates/admin/user/removequeued.inc horde-changed/templates/admin/user/removequeued.inc
--- horde/templates/admin/user/removequeued.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/removequeued.inc	2005-05-03 13:59:23.000000000 +0430
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="1" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Pending Signups:") ?>
     </td>
   </tr><tr>
-    <td align="left" class="control">
+    <td class="control leftAligm">
       <?php printf(_("Are you sure you want to remove the signup request for %s ?"), $f_user_name) ?>
 
       <form method="post" action="<?php echo Horde::selfURL() ?>">
diff -ru horde/templates/portal/layout.inc horde-changed/templates/portal/layout.inc
--- horde/templates/portal/layout.inc	2005-03-20 18:48:49.000000000 +0330
+++ horde-changed/templates/portal/layout.inc	2005-05-03 15:28:47.000000000 +0430
@@ -6,7 +6,7 @@
   <td>
     <?php echo $registry->get('name', $blockInfo['app']) . ': ' . $blocks->getName($blockInfo['app'], $blockInfo['block']) ?>
   </td>
-  <td align="right">
+<td class="rightAlign">
     <?php echo $edit_link ?>
     <?php echo Horde::link($layout->getActionUrl('removeBlock', $row, $col), _("Remove Block"), '', '', '', _("Remove Block")) . Horde::img('close.png', _("Remove Block"), 'align="middle"') ?></a>
   </td>
@@ -20,7 +20,7 @@
     </td>
   </tr>
   <tr>
-    <td align="left" width="11">
+    <td class="leftAlign" width="11">
       <?php if ($col > 0) echo $layout->getControl('expand/left', $row, $col) ?>
       <?php if ($layout->getWidth($row, $col) > 1) echo $layout->getControl('shrink/left', $row, $col) ?>
     </td>
@@ -43,7 +43,7 @@
         </tr>
       </table>
     </td>
-    <td align="right" width="11">
+    <td class="rightAlign" width="11">
       <?php if ($layout->getWidth($row, $col) > 1) echo $layout->getControl('shrink/right', $row, $col) ?>
       <?php echo $layout->getControl('expand/right', $row, $col) ?>
     </td>
@@ -63,7 +63,7 @@
     <td>&nbsp;</td>
   </tr>
   <tr>
-    <td valign="middle" align="left" width="100%">
+    <td valign="middle" class="leftAlign" width="100%">
       <form action="<?php echo Horde::selfUrl() ?>#block" method="post" name="blockform">
         <?php Util::pformInput() ?>
         <input type="hidden" name="row" value="<?php echo $row ?>" />
@@ -90,7 +90,7 @@
           </tr>
 <?php $i = 0; foreach ($blocks->getParams($blockInfo['app'], $blockInfo['block']) as $id): $i++; ?>
           <tr>
-            <td class="<?php echo ($i % 2) ? 'text' : 'item0' ?>" valign="top" align="right"><?php echo $blocks->getParamName($blockInfo['app'], $blockInfo['block'], $id) ?>:&nbsp;</td>
+            <td class="<?php echo ($i % 2) ? 'text' : 'item0' ?> rightAlign" valign="top"><?php echo $blocks->getParamName($blockInfo['app'], $blockInfo['block'], $id) ?>:&nbsp;</td>
             <td class="<?php echo ($i % 2) ? 'text' : 'item0' ?>" valign="top"><?php echo $blocks->getOptionsWidget($blockInfo['app'], $blockInfo['block'], $id, $defaults) ?></td>
           </tr>
 <?php endforeach; endif; ?>
diff -ru horde/templates/portal/menu.inc horde-changed/templates/portal/menu.inc
--- horde/templates/portal/menu.inc	2005-03-26 06:44:40.000000000 +0430
+++ horde-changed/templates/portal/menu.inc	2005-05-03 18:29:27.000000000 +0430
@@ -1,6 +1,6 @@
 <div id="menu">
- <h1 style="float:left"><?php echo sprintf(_("Welcome, %s"), $fullname) ?></h1>
- <span style="float:right">
+ <h1 class="leftFloat"><?php echo sprintf(_("Welcome, %s"), $fullname) ?></h1>
+ <span class="rightFloat">
 <?php
 $menu = &new Menu();
 $menu->add(Horde::applicationUrl('services/portal/'), _("Ho_me"), 'horde.png');
diff -ru horde/templates/portal/sidebar.inc horde-changed/templates/portal/sidebar.inc
--- horde/templates/portal/sidebar.inc	2005-05-04 02:46:00.000000000 +0430
+++ horde-changed/templates/portal/sidebar.inc	2005-05-03 15:58:48.000000000 +0430
@@ -1,8 +1,8 @@
 <div id="expandedSidebar" style="overflow:hidden; padding:0; margin:0">
  <div id="menu" style="overflow:hidden; padding:0; margin:0">
   <?php if (!empty($conf['logo']['image']) || !Util::getFormData('mozbar')): ?>
-  <span style="float:left"><?php if (!$is_mozbar) echo Horde::link('#', _("Collapse Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
-  <span style="float:left"<?php if (empty($conf['logo']['image'])) echo ' id="themelogo"' ?>>
+  <span class="leftFloat"><?php if (!$is_mozbar) echo Horde::link('#', _("Collapse Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
+  <span class="leftFloat"<?php if (empty($conf['logo']['image'])) echo ' id="themelogo"' ?>>
   <?php
   if (!empty($conf['logo']['image'])) {
       if (!empty($conf['logo']['link'])) {
@@ -17,7 +17,7 @@
   }
   ?>
   </span>
-  <span style="float:left;" id="logopad">&nbsp;</span>
+  <span class="leftFloat" id="logopad">&nbsp;</span>
   <div class="clear">&nbsp;</div>
   <?php endif; ?>
  </div>