--- mailhandler.module.1 2007-02-11 08:54:44.000000000 -0800
+++ mailhandler.module	2007-01-31 23:28:42.000000000 -0800
@@ -433,24 +433,24 @@
     // @TODO: We may add a new option in mailboxes to choose which roles can post.
     if ((user_access('edit own blog') && $GLOBALS['user']->uid == $account->uid) || user_access('administer users')) {
       // for now, just show the first mailbox address to user.
       $mailbox = db_fetch_array(db_query('SELECT * FROM {mailhandler} WHERE enabled = 1 ORDER BY mail'));
       if ($mailbox) {
         if ($mailbox['security'] == 1) {
-          $items[] = array(
-            'title' => t('Mail Handler'),
-            'value' => t('You may post to <a href="%blog">your blog</a> by sending an e-mail to %mail. Be sure to include your password at the top of your e-mail body (e.g. <em>pass=mypassword</em>).', array('%blog' => url("blog/$account->uid"), '%mail' => theme('placeholder', $mailbox['mail'])))
-           );
+          $form = array(
+            '#title' => t('Mail Handler'),
+            '#value' => t('You may post to <a href="@blog">your blog</a> by sending an e-mail to %mail. Be sure to include your password at the top of your e-mail body (e.g. <em>pass=mypassword</em>).', array('@blog' => url("blog/$account->uid"), '%mail' => $mailbox['mail']))
+          );
         }
         else {
-          $items[] = array(
-            'title' => t('Mail Handler'),
-            'value' => t('You may post to <a href="%blog">your blog</a> by sending an e-mail to %mail.', array('%blog' => url("blog/$account->uid"), '%mail' => theme('placeholder', $mailbox['mail'])))
-           );
+          $form = array(
+            '#title' => t('Mail Handler'),
+            '#value' => t('You may post to <a href="@blog">your blog</a> by sending an e-mail to %mail.', array('@blog' => url("blog/$account->uid"), '%mail' => $mailbox['mail']))
+          );
         }
-        return array(t('Mail Handler') => $items);
+        return array(t('Mail Handler') => array('mailhandler' => theme('item', $form)));
       }
     }
   }
 }
 
 /**