Initial revision

11 files changed, 2581 insertions, 0 deletions

diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
new file mode 100644
index 000000000..7f1102412
--- /dev/null
+++ b/program/steps/mail/addcontact.inc
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/addcontact.inc                                     |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Add the submitted contact to the users address book                 |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$REMOTE_REQUEST = TRUE;
+
+if ($_GET['_address'])
+  {
+  $contact_arr = $IMAP->decode_address_list($_GET['_address']);
+  if (sizeof($contact_arr))
+    {
+    $contact = $contact_arr[1];
+
+    if ($contact['mailto'])
+      $sql_result = $DB->query(sprintf("SELECT 1 FROM %s
+                                        WHERE  user_id=%d
+                                        AND    email='%s'
+                                        AND    del!='1'",
+                                       get_table_name('contacts'),
+                                       $_SESSION['user_id'],
+                                       $contact['mailto']));
+
+    // contact entry with this mail address exists
+    if ($sql_result && $DB->num_rows($sql_result))
+      $existing_contact = TRUE;
+
+    else if ($contact['mailto'])
+      {
+      $DB->query(sprintf("INSERT INTO %s
+                          (user_id, name, email)
+                          VALUES (%d, '%s', '%s')",
+                         get_table_name('contacts'),
+                         $_SESSION['user_id'],
+                         $contact['name'],
+                         $contact['mailto']));
+
+      $added = $DB->insert_id();
+      }
+    }
+
+  if ($added)
+    $commands = show_message('addedsuccessfully', 'confirmation');
+  else if ($existing_contact)
+    $commands = show_message('contactexists', 'warning');
+  }
+
+
+if (!$commands)
+  $commands = show_message('errorsavingcontact', 'warning');
+
+rcube_remote_response($commands);  
+exit;
+?>
\ No newline at end of file
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
new file mode 100644
index 000000000..b7e91cb2f
--- /dev/null
+++ b/program/steps/mail/compose.inc
@@ -0,0 +1,545 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/compose.inc                                        |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Compose a new mail message with all headers and attachments         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+
+require_once('Mail/mimeDecode.php');
+
+
+$MESSAGE_FORM = NULL;
+$REPLY_MESSAGE = NULL;
+$FORWARD_MESSAGE = NULL;
+
+
+if (!is_array($_SESSION['compose']))
+  $_SESSION['compose'] = array('id' => uniqid(rand()));
+
+
+if ($_GET['_reply_uid'] || $_GET['_forward_uid'])
+  {
+  $msg_uid = $_GET['_reply_uid'] ? $_GET['_reply_uid'] : $_GET['_forward_uid'];
+
+  // similar as in program/steps/mail/show.inc
+  $MESSAGE = array();
+  $MESSAGE['headers'] = $IMAP->get_headers($msg_uid);
+  
+  $MESSAGE['source'] = rcmail_message_source($msg_uid);
+  
+  $mmd = new Mail_mimeDecode($MESSAGE['source']);
+  $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
+                                             'decode_headers' => TRUE,
+                                             'decode_bodies' => FALSE));
+                                             
+  $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
+  $MESSAGE['parts'] = $mmd->getMimeNumbers($MESSAGE['structure']);
+  
+  if ($_GET['_reply_uid'])
+    {
+    $REPLY_MESSAGE = $MESSAGE;
+    $_SESSION['compose']['reply_uid'] = $_GET['_reply_uid'];
+    $_SESSION['compose']['reply_msgid'] = $REPLY_MESSAGE['headers']->messageID;
+    }
+  else
+    {
+    $FORWARD_MESSAGE = $MESSAGE;
+    $_SESSION['compose']['forward_uid'] = $_GET['_forward_uid'];
+    }
+  }
+
+
+
+/****** compose mode functions ********/
+
+
+function rcmail_compose_headers($attrib)
+  {
+  global $IMAP, $REPLY_MESSAGE, $DB;
+
+  list($form_start, $form_end) = get_form_tags($attrib);
+  
+  $out = '';
+  $part = strtolower($attrib['part']);
+  
+  switch ($part)
+    {
+    case 'from':
+      // pass the following attributes to the form class
+      $field_attrib = array('name' => '_from');
+      foreach ($attrib as $attr => $value)
+        if (in_array($attr, array('id', 'class', 'style', 'size')))
+          $field_attrib[$attr] = $value;
+    
+      // get this user's identities
+      $sql_result = $DB->query(sprintf("SELECT identity_id, name, email
+                                        FROM   %s
+                                        WHERE  user_id=%d
+                                        AND    del!='1'
+                                        ORDER BY `default` DESC, name ASC",
+                                       get_table_name('identities'),
+                                       $_SESSION['user_id']));
+                                   
+      if ($DB->num_rows($sql_result))
+        {        
+        $select_from = new select($field_attrib);
+        while ($sql_arr = $DB->fetch_assoc($sql_result))
+          $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $sql_arr['identity_id']);
+        
+        $out = $select_from->show($_POST['_from']);
+        }
+      else
+        {
+        $input_from = new textfield($field_attrib);
+        $out = $input_from->show($_POST['_from']);
+        }
+        
+      if ($form_start)
+        $out = $form_start.$out;
+
+      return $out;
+    
+
+    case 'to':
+      $fname = '_to';
+      $header = 'to';
+      
+      // we have contact id's as get parameters
+      if (strlen($_GET['_to']) && preg_match('/[0-9]+,?/', $_GET['_to']))
+        {
+        $a_recipients = array();
+        $sql_result = $DB->query(sprintf("SELECT name, email
+                                          FROM   %s
+                                          WHERE  user_id=%d
+                                          AND    del!='1'
+                                          AND    contact_id IN (%s)",
+                                         get_table_name('contacts'),
+                                         $_SESSION['user_id'],
+                                         $_GET['_to']));
+                                         
+        while ($sql_arr = $DB->fetch_assoc($sql_result))
+          $a_recipients[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+          
+        if (sizeof($a_recipients))
+          $fvalue = join(', ', $a_recipients);
+        }
+      else if (strlen($_GET['_to']))
+        $fvalue = $_GET['_to'];
+        
+    case 'cc':
+      if (!$fname)
+        {
+        $fname = '_cc';
+        //$header = 'cc';
+        }
+    case 'bcc':
+      if (!$fname)
+        $fname = '_bcc';
+        
+      $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'wrap');
+      $field_type = 'textarea';            
+      break;
+
+    case 'replyto':
+    case 'reply-to':
+      $fname = '_replyto';
+      $allow_attrib = array('id', 'class', 'style', 'size');
+      $field_type = 'textfield';
+      break;
+    
+    }
+    
+    
+  if ($fname && $_POST[$fname])
+    $fvalue = $_POST[$fname];
+  else if ($header && is_object($REPLY_MESSAGE['headers']))
+    {
+    // get recipent address(es) out of the message headers
+    if ($header=='to' && $REPLY_MESSAGE['headers']->replyto)
+      $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->replyto);
+    else if ($header=='to' && $REPLY_MESSAGE['headers']->from)
+      $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->from);
+    
+    // split recipients and put them back together in a unique way
+    $to_addresses = $IMAP->decode_address_list($fvalue);
+    $fvalue = '';
+    foreach ($to_addresses as $addr_part)
+      $fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
+    }
+    
+        
+  if ($fname && $field_type)
+    {
+    // pass the following attributes to the form class
+    $field_attrib = array('name' => $fname);
+    foreach ($attrib as $attr => $value)
+      if (in_array($attr, $allow_attrib))
+        $field_attrib[$attr] = $value;
+
+    // create teaxtarea object
+    $input = new $field_type($field_attrib);
+    $out = $input->show($fvalue);    
+    }
+  
+  if ($form_start)
+    $out = $form_start.$out;
+  
+  return $out;  
+  }
+
+
+/*function rcube_compose_headers($attrib)
+  {
+  global $CONFIG, $OUTPUT;
+
+  list($form_start, $form_end) = get_form_tags($attrib);
+
+  // allow the following attributes to be added to the headers table
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border'));
+  
+  $labels = array();
+  $labels['from'] = rcube_label('from');
+  $labels['to'] = rcube_label('to');
+  $labels['cc'] = rcube_label('cc');
+  $labels['bcc'] = rcube_label('bcc');
+  $labels['replyto'] = rcube_label('replyto');
+
+  $input_from = new textfield(array('name' => '_from', 'size' => 30));
+  $input_to = new textfield(array('name' => '_to', 'size' => 30));
+  $input_cc = new textfield(array('name' => '_cc', 'size' => 30));
+  $input_bcc = new textfield(array('name' => '_bcc', 'size' => 30));
+  $input_replyto = new textfield(array('name' => '_replyto', 'size' => 30));
+
+  $fields = array();
+  $fields['from'] = $input_from->show($_POST['_from']);
+  $fields['to'] = $input_to->show($_POST['_to']);
+  $fields['cc'] = $input_cc->show($_POST['_cc']);
+  $fields['bcc'] = $input_bcc->show($_POST['_bcc']);
+  $fields['replyto'] = $input_replyto->show($_POST['_replyto']);
+
+
+  $out = <<<EOF
+$form_start
+<table$attrib_str><tr>
+
+<td class="title">$labels[from]</td>
+<td>$fields[from]</td>
+
+</tr><tr>
+
+<td class="title">$labels[to]</td>
+<td>$fields[to]</td>
+
+</tr><tr>
+
+<td class="title">$labels[cc]</td>
+<td>$fields[cc]</td>
+
+</tr><tr>
+
+<td class="title">$labels[bcc]</td>
+<td>$fields[bcc]</td>
+
+</tr><tr>
+
+<td class="title">$labels[replyto]</td>
+<td>$fields[replyto]</td>
+
+</tr></table>
+$form_end
+EOF;
+
+  return $out;  
+  }
+*/
+
+
+function rcmail_compose_body($attrib)
+  {
+  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE;
+  
+  list($form_start, $form_end) = get_form_tags($attrib);
+  unset($attrib['form']);
+  
+  $attrib['name'] = '_message';
+  $textarea = new textarea($attrib);
+
+  $body = '';
+  
+  // use posted message body
+  if ($_POST['_message'])
+    $body = $_POST['_message'];
+    
+  // compose reply-body
+  else if (is_array($REPLY_MESSAGE['parts']))
+    {
+    $body = rcmail_first_text_part($REPLY_MESSAGE['parts']);
+    if (strlen($body))
+      $body = rcmail_create_reply_body($body);
+    }
+
+  // forward message body inline
+  else if (is_array($FORWARD_MESSAGE['parts']))
+    {
+    $body = rcmail_first_text_part($FORWARD_MESSAGE['parts']);
+    if (strlen($body))
+      $body = rcmail_create_forward_body($body);
+    }
+  
+  $out = $form_start ? "$form_start\n" : '';
+  $out .= $textarea->show($body);
+  $out .= $form_end ? "\n$form_end" : '';
+         
+  return $out;
+  }
+
+
+function rcmail_create_reply_body($body)
+  {
+  global $IMAP, $REPLY_MESSAGE;
+
+  // soft-wrap message first
+  $body = wordwrap($body, 75);
+  
+  // split body into single lines
+  $a_lines = preg_split('/\r?\n/', $body);
+  
+  // add > to each line
+  for($n=0; $n<sizeof($a_lines); $n++)
+    {
+    if (strpos($a_lines[$n], '>')===0)
+      $a_lines[$n] = '>'.$a_lines[$n];
+    else
+      $a_lines[$n] = '> '.$a_lines[$n];
+    }
+ 
+  $body = join("\n", $a_lines);
+
+  // add title line
+  $pefix = sprintf("\n\n\nOn %s, %s wrote:\n",
+           $REPLY_MESSAGE['headers']->date,
+           $IMAP->decode_header($REPLY_MESSAGE['headers']->from));
+
+  return $pefix.$body;
+  }
+
+
+function rcmail_create_forward_body($body)
+  {
+  global $IMAP, $FORWARD_MESSAGE;
+
+  // soft-wrap message first
+  $body = wordwrap($body, 80);
+  
+  $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
+                   $FORWARD_MESSAGE['subject'],
+                   $FORWARD_MESSAGE['headers']->date,
+                   $IMAP->decode_header($FORWARD_MESSAGE['headers']->from),
+                   $IMAP->decode_header($FORWARD_MESSAGE['headers']->to));
+
+  return $prefix.$body;
+  }
+
+
+
+function rcmail_compose_subject($attrib)
+  {
+  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE;
+  
+  list($form_start, $form_end) = get_form_tags($attrib);
+  unset($attrib['form']);
+  
+  $attrib['name'] = '_subject';
+  $textfield = new textfield($attrib);
+
+  $subject = '';
+
+  // use subject from post
+  if ($_POST['_subject'])
+    $subject = $_POST['_subject'];
+    
+  // create a reply-subject
+  else if (isset($REPLY_MESSAGE['subject']))
+    $subject = 'Re: '.$REPLY_MESSAGE['subject'];
+
+  // create a forward-subject
+  else if (isset($FORWARD_MESSAGE['subject']))
+    $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
+
+  
+  $out = $form_start ? "$form_start\n" : '';
+  $out .= $textfield->show($subject);
+  $out .= $form_end ? "\n$form_end" : '';
+         
+  return $out;
+  }
+
+
+function rcmail_compose_attachment_list($attrib)
+  {
+  global $OUTPUT, $JS_OBJECT_NAME;
+  
+  // add ID if not given
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmAttachmentList';
+  
+  // allow the following attributes to be added to the <ul> tag
+  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
+ 
+  $out = '<ul'. $attrib_str . ">\n";
+  
+  if (is_array($_SESSION['compose']['attachments']))
+    {
+    foreach ($_SESSION['compose']['attachments'] as $i => $a_prop)
+      $out .= sprintf("<li>%s</li>\n", $a_prop['name']);
+    }
+
+  $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
+    
+  $out .= '</ul>';
+  return $out;
+  }
+
+
+
+function rcmail_compose_attachment_form($attrib)
+  {
+  global $OUTPUT, $JS_OBJECT_NAME, $SESS_HIDDEN_FIELD;
+
+  // add ID if not given
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmUploadbox';
+  
+  // allow the following attributes to be added to the <div> tag
+  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
+  $input_field = rcmail_compose_attachment_field(array());
+  $label_send = rcube_label('upload');
+  $label_close = rcube_label('close');
+  
+  $out = <<<EOF
+<div$attrib_str>
+<form action="./" method="post" enctype="multipart/form-data">
+$SESS_HIDDEN_FIELD
+$input_field<br />
+<input type="button" value="$label_close" class="button" onclick="document.getElementById('$attrib[id]').style.visibility='hidden'" />
+<input type="button" value="$label_send" class="button" onclick="$JS_OBJECT_NAME.command('send-attachment', this.form)" />
+</form>
+</div>
+EOF;
+
+  
+  $OUTPUT->add_script(sprintf("%s.gui_object('uploadbox', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
+  return $out;
+  }
+
+
+function rcmail_compose_attachment_field($attrib)
+  {
+  // allow the following attributes to be added to the <input> tag
+  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'size'));
+ 
+  $out = '<input type="file" name="_attachments[]"'. $attrib_str . " />";
+  return $out;
+  }
+
+
+function rcmail_priority_selector($attrib)
+  {
+  list($form_start, $form_end) = get_form_tags($attrib);
+  unset($attrib['form']);
+  
+  $attrib['name'] = '_priority';
+  $selector = new select($attrib);
+
+  $selector->add(array(rcube_label('lowest'),
+                       rcube_label('low'),
+                       rcube_label('normal'),
+                       rcube_label('high'),
+                       rcube_label('highest')),
+                 array(1, 2, 0, 4, 5));
+                 
+  $sel = $_POST['_priority'] ? $_POST['_priority'] : 0;
+
+  $out = $form_start ? "$form_start\n" : '';
+  $out .= $selector->show($sel);
+  $out .= $form_end ? "\n$form_end" : '';
+         
+  return $out;
+  }
+
+
+function get_form_tags($attrib)
+  {
+  global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;  
+
+  $form_start = '';
+  if (!strlen($MESSAGE_FORM))
+    {
+    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+    $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
+    
+    $form_start = !strlen($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
+    $form_start .= "\n$SESS_HIDDEN_FIELD\n";
+    $form_start .= $hiddenfields->show();
+    }
+    
+  $form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
+  $form_name = strlen($attrib['form']) ? $attrib['form'] : 'form';
+  
+  if (!strlen($MESSAGE_FORM))
+    $OUTPUT->add_script("$JS_OBJECT_NAME.gui_object('messageform', '$form_name');");
+  
+  $MESSAGE_FORM = $form_name;
+
+  return array($form_start, $form_end);  
+  }
+
+
+function format_email_recipient($email, $name='')
+  {
+  if ($name && $name != $email)
+    return sprintf('%s <%s>', strpos($name, ",") ? '"'.$name.'"' : $name, $email);
+  else
+    return $email;
+  }
+
+
+/****** get contacts for this user and add them to client scripts ********/
+
+$sql_result = $DB->query(sprintf("SELECT name, email
+                                  FROM   %s
+                                  WHERE  user_id=%d
+                                  AND    del!='1'",
+                                 get_table_name('contacts'),
+                                 $_SESSION['user_id']));
+                                   
+if ($DB->num_rows($sql_result))
+  {        
+  $a_contacts = array();
+  while ($sql_arr = $DB->fetch_assoc($sql_result))
+    if ($sql_arr['email'])
+      $a_contacts[] = format_email_recipient($sql_arr['email'], rep_specialchars_output($sql_arr['name'], 'js'));
+  
+  $OUTPUT->add_script(sprintf("$JS_OBJECT_NAME.set_env('contacts', %s);", array2js($a_contacts)));
+  }
+
+
+
+
+parse_template('compose');
+?>
\ No newline at end of file
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
new file mode 100644
index 000000000..2109bed3a
--- /dev/null
+++ b/program/steps/mail/func.inc
@@ -0,0 +1,1101 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/func.inc                                           |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Provide webmail functionality and GUI objects                       |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+require_once('lib/html2text.inc');
+require_once('lib/enriched.inc');
+
+
+$EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i';
+
+// set imap properties and session vars
+if (strlen($_GET['_mbox']))
+  {
+  $IMAP->set_mailbox($_GET['_mbox']);
+  $_SESSION['mbox'] = $_GET['_mbox'];
+  }
+
+if (strlen($_GET['_page']))
+  {
+  $IMAP->set_page($_GET['_page']);
+  $_SESSION['page'] = $_GET['_page'];
+  }
+
+
+// define url for getting message parts
+if (strlen($_GET['_uid']))
+  $GET_URL = sprintf('%s&_action=get&_mbox=%s&_uid=%d', $COMM_PATH, $IMAP->get_mailbox_name(), $_GET['_uid']);
+
+
+// set current mailbox in client environment
+$OUTPUT->add_script(sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $IMAP->get_mailbox_name()));
+
+
+if ($CONFIG['trash_mbox'])
+  $OUTPUT->add_script(sprintf("%s.set_env('trash_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['trash_mbox']));
+
+
+
+// return the mailboxlist in HTML
+function rcmail_mailbox_list($attrib)
+  {
+  global $IMAP, $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $COMM_PATH;
+  static $s_added_script = FALSE;
+  
+  $type = $attrib['type'] ? $attrib['type'] : 'ul';
+  $add_attrib = $type=='select' ? array('style', 'class', 'id', 'name', 'onchange') :
+                                  array('style', 'class', 'id');
+                                  
+  if ($type=='ul' && !$attrib['id'])
+    $attrib['id'] = 'rcmboxlist';
+
+  // allow the following attributes to be added to the <ul> tag
+  $attrib_str = create_attrib_string($attrib, $add_attrib);
+ 
+  $out = '<' . $type . $attrib_str . ">\n";
+  
+  // add no-selection option
+  if ($type=='select' && $attrib['noselection'])
+    $out .= sprintf('<option value="0">%s</option>'."\n",
+                    rcube_label($attrib['noselection']));
+  
+  // get mailbox list
+  $a_folders = $IMAP->list_mailboxes();
+  $mbox = $IMAP->get_mailbox_name();
+  
+  // for these mailboxes we have localized labels
+  $special_mailboxes = array('inbox', 'sent', 'drafts', 'trash', 'junk');
+
+  foreach ($a_folders as $i => $folder)
+    {
+    $zebra_class = $i%2 ? 'even' : 'odd';
+    
+    $folder_lc = strtolower($folder);
+    if (in_array($folder_lc, $special_mailboxes))
+      $foldername = rcube_label($folder_lc);
+    else
+      $foldername = $folder;
+        
+    if ($unread_count = $IMAP->messagecount($folder, 'UNSEEN'))
+      $foldername .= sprintf(' (%d)', $unread_count);
+      
+    // compose mailbox line
+    if ($type=='select')
+      $out .= sprintf('<option value="%s">%s</option>'."\n",
+                      $folder,
+                      rep_specialchars_output($foldername));
+    
+    else
+      $out .= sprintf('<li class="mailbox %s %s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a></li>'."\n",
+                       preg_replace('/[^a-z0-9\-_]/', '', $folder_lc),
+                       $zebra_class,
+                       $unread_count ? ' unread' : '',
+                       $folder==$mbox ? ' selected' : '',
+                       $folder,
+                       $JS_OBJECT_NAME,
+                       $folder,
+                       $JS_OBJECT_NAME,
+                       $folder,
+                       rep_specialchars_output($foldername));
+    }
+
+  if ($type=='ul')
+    $OUTPUT->add_script(sprintf("%s.gui_object('mailboxlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));
+
+
+/*  this is added further up
+  if (!$s_added_script)
+    {
+    $javascript .= sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $mbox);
+    $OUTPUT->add_script($javascript);
+    $s_added_script = TRUE;
+    }
+*/
+  return $out . "</$type>";
+  }
+
+
+// return the message list as HTML table
+function rcmail_message_list($attrib)
+  {
+  global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT, $JS_OBJECT_NAME;
+  
+  $skin_path = $CONFIG['skin_path'];
+  $image_tag = '<img src="%s%s" alt="%s" border="0" />';
+  
+  // get message headers
+  $a_headers = $IMAP->list_headers();
+
+  // add id to message list table if not specified
+  if (!strlen($attrib['id']))
+    $attrib['id'] = 'rcubemessagelist';
+
+  // allow the following attributes to be added to the <table> tag
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+
+  $out = '<table' . $attrib_str . ">\n";
+  
+  // define list of cols to be displayed
+  $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
+  
+  // show 'to' instead of from in sent messages
+  if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)))
+    $a_show_cols[$f] = 'to';
+
+
+  // add table title
+  $out .= "<thead><tr>\n<td class=\"icon\">&nbsp;</td>\n";
+ 
+  foreach ($a_show_cols as $col)
+    $out .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+
+  $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
+  $out .= "</tr></thead>\n<tbody>\n";
+
+
+  // no messages in this mailbox
+  if (!sizeof($a_headers))
+    {
+    $out .= sprintf('<tr><td colspan="%d">%s</td></tr>',
+                   sizeof($a_show_cols)+2,
+                   rcube_label('nomessagesfound'));
+    }
+
+
+  $a_js_message_arr = array();
+
+  // create row for each message
+  foreach ($a_headers as $i => $header)  //while (list($i, $header) = each($a_headers))
+    {
+    $message_icon = $attach_icon = '';
+    $js_row_arr = array();
+    $zebra_class = $i%2 ? 'even' : 'odd';
+
+    // set messag attributes to javascript array
+    if (!$header->seen)
+      $js_row_arr['unread'] = true;
+    if ($header->answered)
+      $js_row_arr['replied'] = true;
+
+	// set message icon    
+    if ($attrib['unreadicon'] && !$header->seen)
+      $message_icon = $attrib['unreadicon'];
+    else if ($attrib['repliedicon'] && $header->answered)
+      $message_icon = $attrib['repliedicon'];
+    else if ($attrib['messageicon'])
+      $message_icon = $attrib['messageicon'];
+    
+	// set attachment icon
+    if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype))
+      $attach_icon = $attrib['attachmenticon'];
+        
+    $out .= sprintf('<tr id="rcmrow%d" class="message'.($header->seen ? '' : ' unread').' '.$zebra_class.'">'."\n", $header->uid);
+    $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
+        
+    // format each col
+    foreach ($a_show_cols as $col)
+      {
+      if ($col=='from' || $col=='to')
+        $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3, $attrib['addicon']));
+      else if ($col=='subject')
+        $cont = rep_specialchars_output($IMAP->decode_header($header->$col));
+      else if ($col=='size')
+        $cont = show_bytes($header->$col);
+      else if ($col=='date')
+        $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date));
+      else
+        $cont = rep_specialchars_output($header->$col);
+        
+	  $out .= '<td class="'.$col.'">' . $cont . "</td>\n";
+      }
+
+    $out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '');
+    $out .= "</tr>\n";
+    
+    if (sizeof($js_row_arr))
+      $a_js_message_arr[$header->uid] = $js_row_arr;
+    }
+  
+  // complete message table
+  $out .= "</tbody></table>\n";
+  
+  
+  $message_count = $IMAP->messagecount();
+  
+  // set client env
+  $javascript = sprintf("%s.gui_object('messagelist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
+  $javascript .= sprintf("%s.set_env('messagecount', %d);\n", $JS_OBJECT_NAME, $message_count);
+  $javascript .= sprintf("%s.set_env('current_page', %d);\n", $JS_OBJECT_NAME, $IMAP->list_page);
+  $javascript .= sprintf("%s.set_env('pagecount', %d);\n", $JS_OBJECT_NAME, ceil($message_count/$IMAP->page_size));
+  
+  if ($attrib['messageicon'])
+    $javascript .= sprintf("%s.set_env('messageicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['messageicon']);
+  if ($attrib['unreadicon'])
+    $javascript .= sprintf("%s.set_env('unreadicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['unreadicon']);
+  if ($attrib['repliedicon'])
+    $javascript .= sprintf("%s.set_env('repliedicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['repliedicon']);
+  if ($attrib['attachmenticon'])
+    $javascript .= sprintf("%s.set_env('attachmenticon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['attachmenticon']);
+    
+  $javascript .= sprintf("%s.set_env('messages', %s);", $JS_OBJECT_NAME, array2js($a_js_message_arr));
+  
+  $OUTPUT->add_script($javascript);  
+  
+  return $out;
+  }
+
+
+
+
+// return javascript commands to add rows to the message list
+function rcmail_js_message_list($a_headers, $insert_top=FALSE)
+  {
+  global $CONFIG, $IMAP;
+
+  $commands = '';
+  $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
+
+  // show 'to' instead of from in sent messages
+  if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)))
+    $a_show_cols[$f] = 'to';
+
+  // loop through message headers
+  for ($n=0; $a_headers[$n]; $n++)
+    {
+    $header = $a_headers[$n];
+    $a_msg_cols = array();
+    $a_msg_flags = array();
+      
+    // format each col; similar as in rcmail_message_list()
+    foreach ($a_show_cols as $col)
+      {
+      if ($col=='from' || $col=='to')
+        $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3));
+      else if ($col=='subject')
+        $cont = rep_specialchars_output($IMAP->decode_header($header->$col));
+      else if ($col=='size')
+        $cont = show_bytes($header->$col);
+      else if ($col=='date')
+        $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date));
+      else
+        $cont = rep_specialchars_output($header->$col);
+          
+      $a_msg_cols[$col] = $cont;
+      }
+
+    $a_msg_flags['unread'] = $header->seen ? 0 : 1;
+    $a_msg_flags['replied'] = $header->answered ? 1 : 0;
+  
+    $commands .= sprintf("this.add_message_row(%s, %s, %s, %b);\n",
+                         $header->uid,
+                         array2js($a_msg_cols),
+                         array2js($a_msg_flags),
+                         preg_match("/multipart\/m/i", $header->ctype));
+    }
+
+  return $commands;
+  }
+
+
+
+function rcmail_messagecount_display($attrib)
+  {
+  global $IMAP, $OUTPUT, $JS_OBJECT_NAME;
+  
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmcountdisplay';
+
+  $OUTPUT->add_script(sprintf("%s.gui_object('countdisplay', '%s');", $JS_OBJECT_NAME, $attrib['id']));
+
+  // allow the following attributes to be added to the <span> tag
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
+
+  
+  $out = '<span' . $attrib_str . '>';
+  $out .= rcmail_get_messagecount_text();
+  $out .= '</span>';
+  return $out;
+  }
+
+
+
+function rcmail_get_messagecount_text()
+  {
+  global $IMAP, $MESSAGE;
+  
+  if (isset($MESSAGE['index']))
+    {
+    $a_msg_index = $IMAP->message_index();
+    return rcube_label(array('name' => 'messagenrof',
+                             'vars' => array('nr'  => $MESSAGE['index']+1,
+                                             'count' => sizeof($a_msg_index))));
+    }
+  
+  $start_msg = ($IMAP->list_page-1) * $IMAP->page_size + 1;
+  $max = $IMAP->messagecount();
+
+  if ($max==0)
+    $out = rcube_label('mailboxempty');
+  else
+    $out = rcube_label(array('name' => 'messagesfromto',
+                              'vars' => array('from'  => $start_msg,
+                                              'to'    => min($max, $start_msg + $IMAP->page_size - 1),
+                                              'count' => $max)));
+
+  return $out;
+  }
+
+
+function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_primary='text', $ctype_secondary='plain', $encoding='7bit', $safe=FALSE, $plain=FALSE)
+  {
+  global $IMAP, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
+
+  // extract part properties: body, ctype_primary, ctype_secondary, encoding, parameters
+  extract($part);
+  
+  $block = $plain ? '%s' : '%s'; //'<div style="display:block;">%s</div>';
+  $body = $IMAP->mime_decode($body, $encoding);
+  $body = $IMAP->charset_decode($body, $parameters);
+
+
+  // text/html
+  if ($ctype_secondary=='html')
+    {
+    if (!$safe)  // remove remote images and scripts
+      {
+      $remote_patterns = array('/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
+                           //  '/(src|background)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Ui',
+                               '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
+                               '/(<link.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
+                               '/url\s*\(["\']?([hftps]{3,5}:\/{2}[^"\'\s]+)["\']?\)/i',
+                               '/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i',
+                               '/<script.+<\/script>/Umis');
+
+      $remote_replaces = array('\\1=\\2#\\4',
+                            // '\\1=\\2#\\4',
+                               '',
+                               '\\1#\\3',
+                               'none',
+                               'none',
+                               '');
+      
+      // set flag if message containes remote obejcts that where blocked
+      foreach ($remote_patterns as $pattern)
+        {
+        if (preg_match($pattern, $body))
+          {
+          $REMOTE_OBJECTS = TRUE;
+          break;
+          }
+        }
+
+      $body = preg_replace($remote_patterns, $remote_replaces, $body);
+      }
+
+    return sprintf($block, rep_specialchars_output($body, 'html', '', FALSE));
+    }
+
+  // text/enriched
+  if ($ctype_secondary=='enriched')
+    {
+    $body = enriched_to_html($body);
+    return sprintf($block, rep_specialchars_output($body, 'html'));
+    }
+  else
+    {
+    // make links and email-addresses clickable
+    $convert_patterns = $convert_replaces = $replace_strings = array();
+    
+    $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#';
+    $url_chars_within = '\?\.~,!';
+
+    $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
+    $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', &\$replace_strings)";
+
+    $convert_patterns[] = "/([^\/:]|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
+    $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', &\$replace_strings)";
+    
+    $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie';
+    $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', &\$replace_strings)";
+
+    $body = wordwrap(trim($body), 80);
+    $body = preg_replace($convert_patterns, $convert_replaces, $body);
+
+    // split body into single lines
+    $a_lines = preg_split('/\r?\n/', $body);
+
+    // colorize quoted parts
+    for($n=0; $n<sizeof($a_lines); $n++)
+      {
+      $line = $a_lines[$n];
+
+      if ($line{2}=='>')
+        $color = 'red';
+      else if ($line{1}=='>')
+        $color = 'green';
+      else if ($line{0}=='>')
+        $color = 'blue';
+      else
+        $color = FALSE;
+
+      $line = rep_specialchars_output($line, 'html', 'replace', FALSE);
+        
+      if ($color)
+        $a_lines[$n] = sprintf('<font color="%s">%s</font>', $color, $line);
+      else
+        $a_lines[$n] = $line;
+      }
+
+    // insert the links for urls and mailtos
+    $body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));
+    
+    return sprintf($block, "<pre>\n".$body."\n</pre>");
+    }
+  }
+
+
+
+// add a string to the replacement array and return a replacement string
+function rcmail_str_replacement($str, &$rep)
+  {
+  static $count = 0;
+  $rep[$count] = stripslashes($str);
+  return "##string_replacement{".($count++)."}##";
+  }
+
+
+function rcmail_parse_message($structure, $arg=array(), $recursive=FALSE)
+  {
+  global $IMAP;
+  static $sa_inline_objects = array();
+
+  // arguments are: (bool)$prefer_html, (string)$get_url
+  extract($arg);
+
+  $a_attachments = array();
+  $a_return_parts = array();
+  $out = '';
+
+  $message_ctype_primary = strtolower($structure->ctype_primary);
+  $message_ctype_secondary = strtolower($structure->ctype_secondary);
+
+  // show message headers
+  if ($recursive && is_array($structure->headers) && isset($structure->headers['subject']))
+    $a_return_parts[] = array('type' => 'headers',
+                              'headers' => $structure->headers);
+
+  // print body if message doesn't have multiple parts
+  if ($message_ctype_primary=='text')
+    {
+    $a_return_parts[] = array('type' => 'content',
+                              'body' => $structure->body,
+                              'ctype_primary' => $message_ctype_primary,
+                              'ctype_secondary' => $message_ctype_secondary,
+                              'encoding' => $structure->headers['content-transfer-encoding']);
+    }
+
+  // message contains alternative parts
+  else if ($message_ctype_primary=='multipart' && $message_ctype_secondary=='alternative' && is_array($structure->parts))
+    {
+    // get html/plaintext parts
+    $plain_part = $html_part = $print_part = $related_part = NULL;
+    
+    foreach ($structure->parts as $p => $sub_part)
+      {
+      $sub_ctype_primary = strtolower($sub_part->ctype_primary);
+      $sub_ctype_secondary = strtolower($sub_part->ctype_secondary);
+
+      // check if sub part is 
+      if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='plain')
+        $plain_part = $p;
+      else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html')
+        $html_part = $p;
+      else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
+        $enriched_part = $p;
+      else if ($sub_ctype_primary=='multipart' && $sub_ctype_secondary=='related')
+        $related_part = $p;
+      }
+
+    // parse related part (alternative part could be in here)
+    if ($related_part!==NULL && $prefer_html)
+      {
+      list($parts, $attachmnts) = rcmail_parse_message($structure->parts[$related_part], $arg, TRUE);
+      $a_return_parts = array_merge($a_return_parts, $parts);
+      $a_attachments = array_merge($a_attachments, $attachmnts);
+      }
+
+    // print html/plain part
+    else if ($html_part!==NULL && $prefer_html)
+      $print_part = $structure->parts[$html_part];
+    else if ($enriched_part!==NULL)
+      $print_part = $structure->parts[$enriched_part];
+    else if ($plain_part!==NULL)
+      $print_part = $structure->parts[$plain_part];
+
+    // show message body
+    if (is_object($print_part))
+      $a_return_parts[] = array('type' => 'content',
+                                'body' => $print_part->body,
+                                'ctype_primary' => strtolower($print_part->ctype_primary),
+                                'ctype_secondary' => strtolower($print_part->ctype_secondary),
+                                'parameters' => $print_part->ctype_parameters,
+                                'encoding' => $print_part->headers['content-transfer-encoding']);
+    // show plaintext warning
+    else if ($html_part!==NULL)
+      $a_return_parts[] = array('type' => 'content',
+                                'body' => rcube_label('htmlmessage'),
+                                'ctype_primary' => 'text',
+                                'ctype_secondary' => 'plain');
+                                
+    // add html part as attachment
+    if ($html_part!==NULL && $structure->parts[$html_part]!==$print_part)
+      {
+      $html_part = $structure->parts[$html_part];
+      $a_attachments[] = array('filename' => rcube_label('htmlmessage'),
+                               'encoding' => $html_part->headers['content-transfer-encoding'],
+                               'mimetype' => 'text/html',
+                               'part_id'  => $html_part->mime_id,
+                               'size'     => strlen($IMAP->mime_decode($html_part->body, $html_part->headers['content-transfer-encoding'])));
+      }
+    }
+
+  // message contains multiple parts
+  else if ($message_ctype_primary=='multipart' && is_array($structure->parts))
+    {
+    foreach ($structure->parts as $mail_part)
+      {
+      $primary_type = strtolower($mail_part->ctype_primary);
+      $secondary_type = strtolower($mail_part->ctype_secondary);
+
+      // multipart/alternative
+      if ($primary_type=='multipart') // && ($secondary_type=='alternative' || $secondary_type=='mixed' || $secondary_type=='related'))
+        {
+        list($parts, $attachmnts) = rcmail_parse_message($mail_part, $arg, TRUE);
+
+        $a_return_parts = array_merge($a_return_parts, $parts);
+        $a_attachments = array_merge($a_attachments, $attachmnts);
+        }
+
+      // part text/[plain|html] OR message/delivery-status
+      else if (($primary_type=='text' && ($secondary_type=='plain' || $secondary_type=='html')) ||
+               ($primary_type=='message' && $secondary_type=='delivery-status'))
+        {
+        $a_return_parts[] = array('type' => 'content',
+                                  'body' => $mail_part->body,
+                                  'ctype_primary' => $primary_type,
+                                  'ctype_secondary' => $secondary_type,
+                                  'encoding' => $mail_part->headers['content-transfer-encoding']);
+        }
+
+      // part message/*
+      else if ($primary_type=='message')
+        {
+        /* don't parse headers here; they're parsed within the recursive call to rcmail_parse_message()
+        if ($mail_part->parts[0]->headers)
+          $a_return_parts[] = array('type' => 'headers',
+                                    'headers' => $mail_part->parts[0]->headers);
+        */
+                                      
+        list($parts, $attachmnts) = rcmail_parse_message($mail_part->parts[0], $arg, TRUE);
+
+        $a_return_parts = array_merge($a_return_parts, $parts);
+        $a_attachments = array_merge($a_attachments, $attachmnts);
+        }
+
+      // part is file/attachment
+      else if ($mail_part->disposition=='attachment' || $mail_part->disposition=='inline' || $mail_part->headers['content-id'])
+        {
+        if ($message_ctype_secondary=='related' && $mail_part->headers['content-id'])
+          $sa_inline_objects[] = array('filename' => $mail_part->d_parameters['filename'],
+                                       'mimetype' => strtolower("$primary_type/$secondary_type"),
+                                       'part_id'  => $mail_part->mime_id,
+                                       'content_id' => preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']));
+
+        else if ($mail_part->d_parameters['filename'])
+          $a_attachments[] = array('filename' => $mail_part->d_parameters['filename'],
+                                   'encoding' => strtolower($mail_part->headers['content-transfer-encoding']),
+                                   'mimetype' => strtolower("$primary_type/$secondary_type"),
+                                   'part_id'  => $mail_part->mime_id,
+                                   'size'     => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
+                                   'content'  => $mail_part->body */);
+                                   
+        else if ($mail_part->ctype_parameters['name'])
+          $a_attachments[] = array('filename' => $mail_part->ctype_parameters['name'],
+                                   'encoding' => strtolower($mail_part->headers['content-transfer-encoding']),
+                                   'mimetype' => strtolower("$primary_type/$secondary_type"),
+                                   'part_id'  => $mail_part->mime_id,
+                                   'size'     => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
+                                   'content'  => $mail_part->body */);
+                                   
+                                   
+        }
+      }
+
+
+    // if this was a related part try to resolve references
+    if ($message_ctype_secondary=='related' && sizeof($sa_inline_objects))
+      {
+      $a_replace_patters = array();
+      $a_replace_strings = array();
+        
+      foreach ($sa_inline_objects as $inline_object)
+        {
+        $a_replace_patters[] = 'cid:'.$inline_object['content_id'];
+        $a_replace_strings[] = sprintf($get_url, $inline_object['part_id']);
+        }
+      
+      foreach ($a_return_parts as $i => $return_part)
+        {
+        if ($return_part['type']!='content')
+          continue;
+
+        // decode body and replace cid:...
+        $a_return_parts[$i]['body'] = str_replace($a_replace_patters, $a_replace_strings, $IMAP->mime_decode($return_part['body'], $return_part['encoding']));
+        $a_return_parts[$i]['encoding'] = '7bit';
+        }
+      }
+    }
+    
+
+  // join all parts together
+  //$out .= join($part_delimiter, $a_return_parts);
+
+  return array($a_return_parts, $a_attachments);
+  }
+
+
+
+
+// return table with message headers
+function rcmail_message_headers($attrib, $headers=NULL)
+  {
+  global $IMAP, $OUTPUT, $MESSAGE;
+  static $sa_attrib;
+  
+  // keep header table attrib
+  if (is_array($attrib) && !$sa_attrib)
+    $sa_attrib = $attrib;
+  else if (!is_array($attrib) && is_array($sa_attrib))
+    $attrib = $sa_attrib;
+  
+  
+  if (!isset($MESSAGE))
+    return FALSE;
+
+  // get associative array of headers object
+  if (!$headers)
+    $headers = is_object($MESSAGE['headers']) ? get_object_vars($MESSAGE['headers']) : $MESSAGE['headers'];
+    
+  $header_count = 0;
+  
+  // allow the following attributes to be added to the <table> tag
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+  $out = '<table' . $attrib_str . ">\n";
+
+  // show these headers
+  $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'reply-to', 'date');
+  
+  foreach ($standard_headers as $hkey)
+    {
+    if (!$headers[$hkey])
+      continue;
+
+    if ($hkey=='date')
+      $header_value = format_date(strtotime($headers[$hkey]));
+    else if (in_array($hkey, array('from', 'to', 'cc', 'reply-to')))
+      $header_value = rep_specialchars_output(rcmail_address_string($IMAP->decode_header($headers[$hkey]), NULL, $attrib['addicon']));
+    else
+      $header_value = rep_specialchars_output($IMAP->decode_header($headers[$hkey]), '', 'all');
+
+    $out .= "\n<tr>\n";
+    $out .= '<td class="header-title">'.rcube_label($hkey).":&nbsp;</td>\n";
+    $out .= '<td class="'.$hkey.'" width="90%">'.$header_value."</td>\n</tr>";
+    $header_count++;
+    }
+
+  $out .= "\n</table>\n\n";
+
+  return $header_count ? $out : '';  
+  }
+
+
+
+function rcmail_message_body($attrib)
+  {
+  global $CONFIG, $OUTPUT, $MESSAGE, $GET_URL, $REMOTE_OBJECTS, $JS_OBJECT_NAME;
+  
+  if (!is_array($MESSAGE['parts']) && !$MESSAGE['body'])
+    return '';
+    
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmailMsgBody';
+
+  $safe_mode = (bool)$_GET['_safe'];
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
+  $out = '<div '. $attrib_str . ">\n";
+  
+  $header_attrib = array();
+  foreach ($attrib as $attr => $value)
+    if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs))
+      $header_attrib[$regs[1]] = $value;
+
+
+  // this is an ecrypted message
+  // -> create a plaintext body with the according message
+  if (!sizeof($MESSAGE['parts']) && $MESSAGE['headers']->ctype=='multipart/encrypted')
+    {
+    $MESSAGE['parts'][0] = array('type' => 'content',
+                                 'ctype_primary' => 'text',
+                                 'ctype_secondary' => 'plain',
+                                 'body' => rcube_label('encryptedmessage'));
+    }
+  
+  if ($MESSAGE['parts'])
+    {
+    foreach ($MESSAGE['parts'] as $i => $part)
+      {
+      if ($part['type']=='headers')
+        $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part['headers']);
+      else if ($part['type']=='content')
+        {
+//        var_dump($part['parameters']);
+        // $body = rcmail_print_body($part['body'], $part['ctype_primary'], $part['ctype_secondary'], $part['encoding'], $safe_mode);
+        $body = rcmail_print_body($part, $safe_mode);
+        $out .= '<div class="message-part">';
+        $out .= rcmail_mod_html_body($body, $attrib['id']);
+        $out .= "</div>\n";
+        }
+      }
+    }
+  else
+    $out .= $MESSAGE['body'];
+
+
+  $ctype_primary = strtolower($MESSAGE['structure']->ctype_primary);
+  $ctype_secondary = strtolower($MESSAGE['structure']->ctype_secondary);
+  
+  // list images after mail body
+  if (get_boolean($attrib['showimages']) && $ctype_primary=='multipart' && $ctype_secondary=='mixed' &&
+      sizeof($MESSAGE['attachments']) && !strstr($message_body, '<html') && strlen($GET_URL))
+    {
+    foreach ($MESSAGE['attachments'] as $attach_prop)
+      {
+      if (strpos($attach_prop['mimetype'], 'image/')===0)
+        $out .= sprintf("\n<hr />\n<p align=\"center\"><img src=\"%s&_part=%s\" alt=\"%s\" title=\"%s\" /></p>\n",
+                        $GET_URL, $attach_prop['part_id'],
+                        $attach_prop['filename'],
+                        $attach_prop['filename']);
+      }
+    }
+  
+  // tell client that there are blocked remote objects
+  if ($REMOTE_OBJECTS && !$safe_mode)
+    $OUTPUT->add_script(sprintf("%s.set_env('blockedobjects', true);", $JS_OBJECT_NAME));
+
+  $out .= "\n</div>";
+  return $out;
+  }
+
+
+
+// modify a HTML message that it can be displayed inside a HTML page
+function rcmail_mod_html_body($body, $container_id)
+  {
+  $last_style_pos = 0;
+  $body_lc = strtolower($body);
+  
+  // find STYLE tags
+  while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos)))
+    {
+    $pos2 += 8;
+    $body_pre = substr($body, 0, $pos);
+    $styles = substr($body, $pos, $pos2-$pos);
+    $body_post = substr($body, $pos2, strlen($body)-$pos2);
+    
+    // replace all css definitions with #container [def]
+    $styles = rcmail_mod_css_styles($styles, $container_id);
+    
+    $body = $body_pre . $styles . $body_post;
+    $last_style_pos = $pos2;
+    }
+
+
+  // remove SCRIPT tags
+  while (($pos = strpos($body_lc, '<script')) && ($pos2 = strpos($body_lc, '</script>', $pos)))
+    {
+    $pos2 += 8;
+    $body = substr($body, 0, $pos) . substr($body, $pos2, strlen($body)-$pos2);
+    $body_lc = strtolower($body);
+    }
+  
+
+  // resolve <base href>
+  $base_reg = '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i';
+  if (preg_match($base_reg, $body, $regs))
+    {
+    $base_url = $regs[2];
+    $body = preg_replace('/(src|background|href)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Uie', "'\\1=\"'.make_absolute_url('\\3', '$base_url').'\"'", $body);
+    $body = preg_replace('/(url\s*\()(["\']?)([\.\/]+[^"\'\)\s]+)(\2)\)/Uie', "'\\1\''.make_absolute_url('\\3', '$base_url').'\')'", $body);
+    $body = preg_replace($base_reg, '', $body);
+    }
+
+
+  // add comments arround html and other tags
+  $out = preg_replace(array('/(<\/?html[^>]*>)/i',
+                            '/(<\/?head[^>]*>)/i',
+                            '/(<title[^>]*>.+<\/title>)/ui',
+                            '/(<\/?meta[^>]*>)/i'),
+                      '<!--\\1-->',
+                      $body);
+                      
+  $out = preg_replace(array('/(<body[^>]*>)/i',
+                            '/(<\/body>)/i'),
+                      array('<div class="rcmBody">',
+                            '</div>'),
+                      $out);
+
+  
+  return $out;
+  }
+
+
+
+// replace all css definitions with #container [def]
+function rcmail_mod_css_styles($source, $container_id)
+  {
+  $a_css_values = array();
+  $last_pos = 0;
+  
+  // cut out all contents between { and }
+  while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
+    {
+    $key = sizeof($a_css_values);
+    $a_css_values[$key] = substr($source, $pos+1, $pos2-($pos+1));
+    $source = substr($source, 0, $pos+1) . "<<str_replacement[$key]>>" . substr($source, $pos2, strlen($source)-$pos2);
+    $last_pos = $pos+2;
+    }
+  
+  $styles = preg_replace('/(^\s*|,\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', "\\1#$container_id \\2", $source);
+  $styles = preg_replace('/<<str_replacement\[([0-9]+)\]>>/e', "\$a_css_values[\\1]", $styles);
+  
+  // replace body definition because we also stripped off the <body> tag
+  $styles = preg_replace("/$container_id\s+body/i", "$container_id div.rcmBody", $styles);
+  
+  return $styles;
+  }
+
+
+
+// return first text part of a message
+function rcmail_first_text_part($message_parts)
+  {
+  if (!is_array($message_parts))
+    return FALSE;
+    
+  $html_part = NULL;
+      
+  // check all message parts
+  foreach ($message_parts as $pid => $part)
+    {
+    $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
+    if ($mimetype=='text/plain')
+      {
+      $body = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']);
+      $body = rcube_imap::charset_decode($body, $part->ctype_parameters);
+      return $body;
+      }
+    else if ($mimetype=='text/html')
+      {
+      $html_part = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']);
+      $html_part = rcube_imap::charset_decode($html_part, $part->ctype_parameters);
+      }
+    }
+    
+
+  // convert HTML to plain text
+  if ($html_part)
+    {    
+    // remove special chars encoding
+    $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
+    $html_part = strtr($html_part, $trans);
+
+    // create instance of html2text class
+    $txt = new html2text($html_part);
+    return $txt->get_text();
+    }
+
+  return FALSE;
+  }
+
+
+// get source code of a specific message and cache it
+function rcmail_message_source($uid)
+  {
+  global $IMAP, $DB;
+
+  // get message ID if uid is given  
+  $headers = $IMAP->get_headers($uid);
+  $message_id = $headers->messageID;
+  
+  // get cached message source
+  $msg_source = rcube_read_cache($message_id);
+
+  // get message from server and cache it
+  if (!$msg_source)
+    {
+    $msg_source = $IMAP->get_raw_body($uid);
+    rcube_write_cache($message_id, $msg_source, TRUE);
+    }
+
+  return $msg_source;
+  }
+
+
+// decode address string and re-format it as HTML links
+function rcmail_address_string($input, $max=NULL, $addicon=NULL)
+  {
+  global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $EMAIL_ADDRESS_PATTERN;
+  
+  $a_parts = $IMAP->decode_address_list($input);
+
+  if (!sizeof($a_parts))
+    return $input;
+
+  $c = count($a_parts);
+  $j = 0;
+  $out = '';
+
+  foreach ($a_parts as $part)
+    {
+    $j++;
+    if ($PRINT_MODE)
+      $out .= sprintf('%s &lt;%s&gt;', htmlentities($part['name']), $part['mailto']);
+    else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto']))
+      {
+      $out .= sprintf('<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
+                      $part['mailto'],
+                      $JS_OBJECT_NAME,
+                      $part['mailto'],
+                      $part['mailto'],
+                      htmlentities($part['name']));
+                      
+      if ($addicon)
+        $out .= sprintf('&nbsp;<a href="#add" onclick="return %s.command(\'add-contact\',\'%s\',this)" title="%s"><img src="%s%s" alt="add" border="0" /></a>',
+                        $JS_OBJECT_NAME,
+                        urlencode($part['string']),
+                        rcube_label('addtoaddressbook'),
+                        $CONFIG['skin_path'],
+                        $addicon);
+      }
+    else
+      {
+      if ($part['name'])
+        $out .= htmlentities($part['name']);
+      if ($part['mailto'])
+        $out .= (strlen($out) ? ' ' : '') . sprintf('&lt;%s&gt;', $part['mailto']);
+      }
+      
+    if ($c>$j)
+      $out .= ','.($max ? '&nbsp;' : ' ');
+        
+    if ($max && $j==$max && $c>$j)
+      {
+      $out .= '...';
+      break;
+      }        
+    }
+    
+  return $out;
+  }
+
+
+function rcmail_message_part_controls()
+  {
+  global $CONFIG, $IMAP, $MESSAGE;
+  
+  if (!is_array($MESSAGE) || !is_array($MESSAGE['parts']) || !($_GET['_uid'] && $_GET['_part']) || !$MESSAGE['parts'][$_GET['_part']])
+    return '';
+    
+  $part = $MESSAGE['parts'][$_GET['_part']];
+  
+  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'summary'));
+  $out = '<table '. $attrib_str . ">\n";
+  
+  $filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];
+  $filesize = strlen($IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
+  
+  if ($filename)
+    {
+    $out .= sprintf('<tr><td class="title">%s</td><td>%s</td><td>[<a href="./?%s">%s</a>]</tr>'."\n",
+                    rcube_label('filename'),
+                    rep_specialchars_output($filename),
+                    str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']),
+                    rcube_label('download'));
+    }
+    
+  if ($filesize)
+    $out .= sprintf('<tr><td class="title">%s</td><td>%s</td></tr>'."\n",
+                    rcube_label('filesize'),
+                    show_bytes($filesize));
+  
+  $out .= "\n</table>";
+  
+  return $out;
+  }
+
+
+
+function rcmail_message_part_frame($attrib)
+  {
+  global $MESSAGE;
+  
+  $part = $MESSAGE['parts'][$_GET['_part']];
+  $ctype_primary = strtolower($part->ctype_primary);
+
+  $attrib['src'] = './?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
+
+  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height'));
+  $out = '<iframe '. $attrib_str . "></ifame>";
+    
+  return $out;
+  }
+
+
+
+// clear message composing settings
+function rcmail_compose_cleanup()
+  {
+  if (!isset($_SESSION['compose']))
+    return;
+  
+  // remove attachment files from temp dir
+  if (is_array($_SESSION['compose']['attachments']))
+    foreach ($_SESSION['compose']['attachments'] as $attachment)
+      unlink($attachment['path']);
+
+  // kill temp dir
+  if ($_SESSION['compose']['temp_dir'])
+    rmdir($_SESSION['compose']['temp_dir']);
+  
+  unset($_SESSION['compose']);
+  }
+  
+  
+?>
\ No newline at end of file
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
new file mode 100644
index 000000000..018ae2e4c
--- /dev/null
+++ b/program/steps/mail/get.inc
@@ -0,0 +1,159 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/get.inc                                            |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Delivering a specific part of a mail message                        |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+require_once('Mail/mimeDecode.php');
+
+
+// show loading page
+if ($_GET['_preload'])
+  {
+  $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
+  $message = rcube_label('loadingdata');
+
+  print "<html>\n<head>\n" .
+        '<meta http-equiv="refresh" content="0; url='.$url.'">' .
+        "\n</head>\n<body>" .
+        $message .
+        "\n</body>\n</html>";
+  exit;
+  }
+
+
+
+// similar code as in program/steps/mail/show.inc
+if ($_GET['_uid'])
+  {
+  $MESSAGE = array();
+  $MESSAGE['source'] = rcmail_message_source($_GET['_uid']);
+
+  $mmd = new Mail_mimeDecode($MESSAGE['source']);
+  $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
+                                             'decode_headers' => FALSE,
+                                             'decode_bodies' => FALSE));
+
+  $MESSAGE['parts'] = $mmd->getMimeNumbers($MESSAGE['structure']);
+  }
+
+
+
+// show part page
+if ($_GET['_frame'])
+  {
+  parse_template('messagepart');
+  exit;
+  }
+
+else if ($_GET['_part'])
+  {
+  if ($part = $MESSAGE['parts'][$_GET['_part']]);
+    {
+    $ctype_primary = strtolower($part->ctype_primary);
+    $ctype_secondary = strtolower($part->ctype_secondary);
+
+    $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+    $filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];
+    
+    if ($ctype_primary=='text')
+      {
+      list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
+                                                     array('safe' => (bool)$_GET['_safe'],
+                                                           'prefer_html' => TRUE,
+                                                           'get_url' => $GET_URL.'&_part=%s'));
+
+      $cont = rcmail_print_body($MESSAGE['parts'][0], (bool)$_GET['_safe']);
+      }
+    else
+      $cont = $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']);
+
+    // send correct headers for content type and length
+    if ($_GET['_download'])
+      {
+      // send download headers
+      header("Content-Type: application/octet-stream");
+      header(sprintf('Content-Disposition: attachment; filename="%s"',
+                     $filename ? $filename : "roundcube.$ctype_secondary"));
+      }
+    else
+      {
+      header("Content-Type: $mimetype");
+      header(sprintf('Content-Disposition: inline; filename="%s"', $filename));
+      }
+
+    header(sprintf('Content-Length: %d', strlen($cont)));
+
+    // deliver part content
+    echo $cont;
+    exit;
+    }
+  }
+
+// print message
+else
+  {
+  $ctype_primary = strtolower($MESSAGE['structure']->ctype_primary);
+  $ctype_secondary = strtolower($MESSAGE['structure']->ctype_secondary);
+  $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+
+  // send correct headers for content type
+  header("Content-Type: text/html");
+
+  $cont = ''; 
+  list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
+                                                 array('safe' => (bool)$_GET['_safe'],
+                                                 'get_url' => $GET_URL.'&_part=%s'));
+
+  if ($MESSAGE['parts'] && $ctype_primary=='multipart')
+    {
+    // reset output page
+    $OUTPUT = new rcube_html_page();
+    parse_template('messagepart');
+    exit;
+    }
+  else if ($MESSAGE['parts'][0])
+    {
+    $part = $MESSAGE['parts'][0];
+    $cont = rcmail_print_body($part, (bool)$_GET['_safe']);
+    }
+  else
+    $cont = $IMAP->get_body($_GET['_uid']);
+
+  $OUTPUT = new rcube_html_page();
+  $OUTPUT->write($cont);
+
+/*
+    if ($mimetype=='text/html')
+      print $cont;
+    else
+      {
+      print "<html>\n<body>\n";
+      print $cont;
+      print "\n</body>\n</html>";
+      }
+*/
+  exit;
+  }
+
+
+// if we arrive here, the requested part was not found
+header('HTTP/1.1 404 Not Found');
+exit;
+
+?>
\ No newline at end of file
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
new file mode 100644
index 000000000..58a1bb84e
--- /dev/null
+++ b/program/steps/mail/list.inc
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/list.inc                                           |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Send message list to client (as remote response)                    |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$REMOTE_REQUEST = TRUE;
+
+$count = $IMAP->messagecount();
+
+// update message count display
+$pages = ceil($count/$IMAP->page_size);
+$commands = sprintf("this.set_env('messagecount', %d);\n", $count);
+$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
+$commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
+
+// update mailboxlist
+$mbox = $IMAP->get_mailbox_name();
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+
+
+// add message rows
+if ($count)
+  {
+  $a_headers = $IMAP->list_headers($mbox);
+  $commands .= rcmail_js_message_list($a_headers);
+  }
+
+  
+// send response
+rcube_remote_response($commands);
+
+exit;
+?>
\ No newline at end of file
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
new file mode 100644
index 000000000..2dadb53eb
--- /dev/null
+++ b/program/steps/mail/mark.inc
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/mark.inc                                           |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Mark the submitted messages with the specified flag                 |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$REMOTE_REQUEST = TRUE;
+
+$a_flags_map = array('read' => 'SEEN',
+                     'unread' => 'UNSEEN');
+
+if ($_GET['_uid'] && $_GET['_flag'])
+  {
+  $flag = $a_flags_map[$_GET['_flag']] ? $a_flags_map[$_GET['_flag']] : strtoupper($_GET['_flag']);
+  $marked = $IMAP->set_flag($_GET['_uid'], $flag);
+  
+  if ($marked)
+    {
+    $mbox = $IMAP->get_mailbox_name();
+    $commands = sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+    rcube_remote_response($commands);
+    }
+  }
+  
+exit;
+?>
\ No newline at end of file
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
new file mode 100644
index 000000000..e090d305b
--- /dev/null
+++ b/program/steps/mail/move_del.inc
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/move_del.inc                                       |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Move the submitted messages to a specific mailbox or delete them    |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+$REMOTE_REQUEST = TRUE;
+
+// move messages
+if ($_action=='moveto' && $_GET['_uid'] && $_GET['_target_mbox'])
+  {
+  $count = sizeof(explode(',', $_GET['_uid']));  
+  $moved = $IMAP->move_message($_GET['_uid'], $_GET['_target_mbox'], $_GET['_mbox']);
+  
+  if (!$moved)
+    {
+    // send error message
+    exit;
+    }
+  }
+
+// delete messages 
+else if ($_action=='delete' && $_GET['_uid'])
+  {
+  $count = sizeof(explode(',', $_GET['_uid']));
+  $del = $IMAP->delete_message($_GET['_uid'], $_GET['_mbox']);
+  
+  if (!$del)
+    {
+    // send error message
+    exit;
+    }
+  }
+  
+// unknown action or missing query param
+else
+  {
+  exit;
+  }
+
+
+// update message count display
+$pages = ceil($IMAP->messagecount()/$IMAP->page_size);
+$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
+$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
+
+  
+// update mailboxlist
+$mbox = $IMAP->get_mailbox_name();
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN'));
+
+
+// add new rows from next page (if any)
+if ($_GET['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
+  {
+  $a_headers = $IMAP->list_headers($mbox);
+  $a_headers = array_slice($a_headers, -$count, $count);
+  $commands .= rcmail_js_message_list($a_headers);
+  }
+
+  
+// send response
+rcube_remote_response($commands);
+
+exit;
+?>
\ No newline at end of file
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
new file mode 100644
index 000000000..789001e14
--- /dev/null
+++ b/program/steps/mail/sendmail.inc
@@ -0,0 +1,251 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/sendmail.inc                                       |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Compose a new mail message with all headers and attachments         |
+ |   and send it using IlohaMail's SMTP methods or with PHP mail()       |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+
+require_once('lib/smtp.inc');
+require_once('Mail/mime.php');
+
+
+if (!isset($_SESSION['compose']['id']))
+  {
+  $_action = 'list';
+  return;
+  }
+
+
+/****** message sending functions ********/
+
+
+
+function rcmail_get_identity($id)
+  {
+  global $DB;
+  
+  // get identity record
+  $sql_result = $DB->query(sprintf("SELECT *, email AS mailto
+                                    FROM   %s
+                                    WHERE  identity_id=%d
+                                    AND    user_id=%d
+                                    AND    del!='1'",
+                                   get_table_name('identities'),
+                                   $id,
+                                   $_SESSION['user_id']));
+                                   
+  if ($DB->num_rows($sql_result))
+    {
+    $sql_arr = $DB->fetch_assoc($sql_result);
+    $out = $sql_arr;
+    $out['string'] = sprintf('%s <%s>', $sql_arr['name'], $sql_arr['mailto']);
+    return $out;
+    }
+
+  return FALSE;  
+  }
+
+
+
+/****** check submission and compose message ********/
+
+
+$mailto_regexp = '/,\s*$/';
+
+// trip ending ', ' from 
+$mailto = preg_replace($mailto_regexp, '', $_POST['_to']);
+
+// decode address strings
+$to_address_arr = $IMAP->decode_address_list($mailto);
+$identity_arr = rcmail_get_identity($_POST['_from']);
+
+
+$from = $identity_arr['mailto'];
+$first_to = is_array($to_address_arr[0]) ? $to_address_arr[0]['mailto'] : $mailto;
+
+
+// create unique message-id
+$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail')), $_SESSION['imap_host']);
+
+
+// compose headers array
+$headers = array('Date' => date('D, j M Y G:i:s O'),
+                 'From' => $identity_arr['string'],
+                 'To'   => $mailto);
+
+// additional recipients
+if ($_POST['_cc'])
+  $headers['Cc'] = preg_replace($mailto_regexp, '', $_POST['_cc']);
+
+if ($_POST['_bcc'])
+  $headers['Bcc'] = preg_replace($mailto_regexp, '', $_POST['_bcc']);
+  
+if (strlen($identity_arr['bcc']))
+  $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
+
+// add subject
+$headers['Subject'] = trim(stripslashes($_POST['_subject']));
+
+if (strlen($identity_arr['organization']))
+  $headers['Organization'] = $identity_arr['organization'];
+
+if (strlen($identity_arr['reply-to']))
+  $headers['Reply-To'] = $identity_arr['reply-to'];
+
+if ($_SESSION['compose']['reply_msgid'])
+  $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
+
+
+if ($_POST['_priority'])
+  {
+  $priority = (int)$_POST['_priority'];
+  $a_priorities = array(1=>'lowest', 2=>'low', 4=>'high', 5=>'highest');
+  if ($str_priority = $a_priorities[$priority])
+    $headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
+  }
+
+
+// additional headers
+$headers['Message-ID'] = $message_id;
+$headers['X-Sender'] = $from;
+
+if ($CONFIG['useragent'])
+  $headers['User-Agent'] = $CONFIG['useragent'];
+
+
+// create PEAR::Mail_mime instance
+$MAIL_MIME = new Mail_mime();
+$MAIL_MIME->setTXTBody(stripslashes($_POST['_message']), FALSE, TRUE);
+//$MAIL_MIME->setTXTBody(wordwrap(stripslashes($_POST['_message'])), FALSE, TRUE);
+
+
+// add stored attachments, if any
+if (is_array($_SESSION['compose']['attachments']))
+  foreach ($_SESSION['compose']['attachments'] as $attachment)
+    $MAIL_MIME->addAttachment($attachment['path'], $attachment['mimetype'], $attachment['name'], TRUE);
+
+  
+// add submitted attachments
+if (is_array($_FILES['_attachments']['tmp_name']))
+  foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
+    $MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], TRUE);
+
+
+// compose message body and get headers
+$msg_body = $MAIL_MIME->get();
+$msg_subject = $headers['Subject'];
+
+
+// send thru SMTP server using cusotm SMTP library
+if ($CONFIG['smtp_server'])
+  {
+  // connect to SMTP server
+  $smtp_conn = smtp_connect($CONFIG['smtp_server'], '25', $CONFIG['smtp_user'], $CONFIG['smtp_pass']);
+	
+  if ($smtp_conn)
+    {
+    // generate list of recipients
+    $recipients = $mailto.', '.$headers['Cc'].', '.$headers['Bcc'];
+    $a_recipients = smtp_expand($recipients);
+
+    // generate message headers
+    $header_str = $MAIL_MIME->txtHeaders($headers);
+	
+    // send message
+    $sent = smtp_mail($smtp_conn, $from, $a_recipients, $header_str."\r\n".$msg_body, FALSE);
+	}
+	
+  // log error
+  if (!$smtp_conn || !$sent)
+    {
+    raise_error(array('code' => 800,
+                      'type' => 'smtp',
+                      'line' => __LINE__,
+                      'file' => __FILE__,
+                      'message' => "Connection failed: $smtp_error"), TRUE, FALSE);
+    }
+  }
+
+// send mail using PHP's mail() function
+else
+  {
+  // unset some headers because they will be added by the mail() function
+  $headers_php = $headers;
+  unset($headers_php['To'], $headers_php['Subject']);
+
+  $header_str = $MAIL_MIME->txtHeaders($headers_php);
+  $sent = mail($mailto, $msg_subject, $msg_body, $header_str, "-f$from");
+  }
+
+
+// return to compose page if sending failed
+if (!$sent)
+  {
+  $_action = 'compose';
+  $OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));
+  show_message("sendingfailed", 'error'); 
+  return;
+  }
+
+
+// set repliead flag
+if ($_SESSION['compose']['reply_uid'])
+  $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
+
+
+// copy message to sent folder
+if ($CONFIG['sent_mbox'])
+  {
+  // create string of complete message headers
+  $header_str = $MAIL_MIME->txtHeaders($headers);
+
+  // check if mailbox exists
+  if (!in_array_nocase($CONFIG['sent_mbox'], $IMAP->list_mailboxes()))
+    $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
+
+  // append message to sent box
+  $saved = $IMAP->save_message($CONFIG['sent_mbox'], $header_str."\r\n".$msg_body);
+  }
+
+
+// log mail sending
+if ($CONFIG['smtp_log'])
+  {
+  $log_entry = sprintf("[%s] User: %d; Message for %s; Subject: %s\n",
+               date("d-M-Y H:i:s O", mktime()),
+               $_SESSION['user_id'],
+               $mailto,
+               $msg_subject);
+
+  if ($fp = fopen($INSTALL_PATH.'logs/sendmail', 'a'))
+    {
+    fwrite($fp, $log_entry);
+    fclose($fp);
+    }
+  }
+
+
+// show confirmation
+show_message('messagesent', 'confirmation');
+
+
+// kill compose entry from session
+rcmail_compose_cleanup();
+
+?>
\ No newline at end of file
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
new file mode 100644
index 000000000..de4f2b4cb
--- /dev/null
+++ b/program/steps/mail/show.inc
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/show.inc                                           |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Display a mail message similar as a usual mail application does     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+require_once('Mail/mimeDecode.php');
+
+$PRINT_MODE = $_action=='print' ? TRUE : FALSE;
+
+
+// similar code as in program/steps/mail/get.inc
+if ($_GET['_uid'])
+  {
+  $MESSAGE = array();
+  $MESSAGE['headers'] = $IMAP->get_headers($_GET['_uid']);
+  $MESSAGE['source'] = rcmail_message_source($_GET['_uid']);
+  
+  // go back to list if message not found (wrong UID)
+  if (!$MESSAGE['headers'] || !$MESSAGE['source'])
+    {
+    $_action = 'list';
+    return;
+    }
+
+  $mmd = new Mail_mimeDecode($MESSAGE['source']);
+  $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
+                                             'decode_headers' => FALSE,
+                                             'decode_bodies' => FALSE));
+                                             
+  $mmd->getMimeNumbers($MESSAGE['structure']);
+
+  $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['structure']->headers['subject']);
+
+  if ($MESSAGE['structure'])
+    list($MESSAGE['parts'], $MESSAGE['attachments']) = rcmail_parse_message($MESSAGE['structure'],
+                                                                           array('safe' => (bool)$_GET['_safe'],
+                                                                                 'prefer_html' => $CONFIG['prefer_html'],
+                                                                                 'get_url' => $GET_URL.'&_part=%s'));
+  else
+    $MESSAGE['body'] = $IMAP->get_body($_GET['_uid']);
+
+
+  // mark message as read
+  if (!$MESSAGE['headers']->seen)
+    $IMAP->set_flag($_GET['_uid'], 'SEEN');
+
+  // give message uid to the client
+  $javascript = sprintf("%s.set_env('uid', '%s');\n", $JS_OBJECT_NAME, $_GET['_uid']);
+  $javascript .= sprintf("%s.set_env('safemode', '%b');", $JS_OBJECT_NAME, $_GET['_safe']);
+
+  // get previous and next message UID
+  $a_msg_index = $IMAP->message_index();
+  $MESSAGE['index'] = array_search((string)$_GET['_uid'], $a_msg_index, TRUE);
+  
+  if (isset($a_msg_index[$MESSAGE['index']-1]))
+    $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']-1]);
+  if (isset($a_msg_index[$MESSAGE['index']+1]))
+    $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']+1]);
+
+  $OUTPUT->add_script($javascript);
+  }
+
+
+
+function rcmail_message_attachments($attrib)
+  {
+  global $CONFIG, $OUTPUT, $PRINT_MODE, $MESSAGE, $GET_URL, $JS_OBJECT_NAME;
+
+  if (sizeof($MESSAGE['attachments']))
+    {
+    // allow the following attributes to be added to the <ul> tag
+    $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
+    $out = '<ul' . $attrib_str . ">\n";
+
+    foreach ($MESSAGE['attachments'] as $attach_prop)
+      {
+      if ($PRINT_MODE)
+        $out .= sprintf('<li>%s (%s)</li>'."\n",
+                        $attach_prop['filename'],
+                        show_bytes($attach_prop['size']));
+      else
+        $out .= sprintf('<li><a href="#attachment" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n",
+                        $JS_OBJECT_NAME,
+                        $attach_prop['part_id'],
+                        $attach_prop['mimetype'],
+                        $attach_prop['filename']);
+    /* direct link
+      else
+        $out .= sprintf('<li><a href="%s&_part=%s&_frame=1" target="rcubemailattachment">%s</a></li>'."\n",
+                        $GET_URL,
+                        $attach_prop['part_id'],
+                        $attach_prop['filename']);
+    */
+      }
+
+    $out .= "</ul>";
+    return $out;
+    }  
+  }
+
+
+
+// return an HTML iframe for loading mail content
+function rcmail_messagecontent_frame($attrib)
+  {
+  global $COMM_PATH, $OUTPUT, $GET_URL, $JS_OBJECT_NAME;
+  
+  // allow the following attributes to be added to the <iframe> tag
+  $attrib_str = create_attrib_string($attrib);
+  $framename = 'rcmailcontentwindow';
+  
+  $out = sprintf('<iframe src="%s" name="%s"%s>%s</iframe>'."\n",
+         $GET_URL,
+         $framename,
+         $attrib_str,
+         rcube_label('loading'));
+
+
+  $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');");
+
+  return $out;
+  }
+
+
+function rcmail_remote_objects_msg($attrib)
+  {
+  global $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
+  
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmremoteobjmsg';
+
+  // allow the following attributes to be added to the <div> tag
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
+  $out = '<div' . $attrib_str . ">";
+  
+  $out .= rep_specialchars_output(sprintf('%s&nbsp;<a href="#loadimages" onclick="%s.command(\'load-images\')" title="%s">%s</a>',
+                                  rcube_label('blockedimages'),
+                                  $JS_OBJECT_NAME,
+                                  rcube_label('showimages'),
+                                  rcube_label('showimages')));
+  
+  $out .= '</div>';
+  
+  $OUTPUT->add_script(sprintf("%s.gui_object('remoteobjectsmsg', '%s');", $JS_OBJECT_NAME, $attrib['id']));
+  return $out;
+  }
+
+
+if ($_action=='print')
+  parse_template('printmessage');
+else
+  parse_template('message');
+?>
\ No newline at end of file
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
new file mode 100644
index 000000000..4f1eb3dab
--- /dev/null
+++ b/program/steps/mail/upload.inc
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/upload.inc                                         |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Handle file-upload and make them available as attachments           |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+
+if (!$_SESSION['compose'])
+  {
+  exit;
+  }
+
+
+if (strlen($CONFIG['temp_dir']))
+  $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];
+
+if (!is_array($_SESSION['compose']['attachments']))
+  {
+  $_SESSION['compose']['attachments'] = array();
+
+  // create temp-dir for uploaded attachments
+  if ($CONFIG['temp_dir'] && is_writeable($CONFIG['temp_dir']))
+    {
+    mkdir($temp_dir);
+    $_SESSION['compose']['temp_dir'] = $temp_dir;
+    }
+  }
+
+
+$response = '';
+
+foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
+  {
+  $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
+  if (copy($filepath, $tmpfname))
+    {
+    $_SESSION['compose']['attachments'][] = array('name' => $_FILES['_attachments']['name'][$i],
+                                                  'mimetype' => $_FILES['_attachments']['type'][$i],
+                                                  'path' => $tmpfname);
+
+    $response .= sprintf("parent.%s.add2attachment_list('%s');\n", $JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i]);
+    }
+  }
+
+
+// send html page with JS calls as response
+print <<<EOF
+<html>
+<script type="text/javascript">
+if (parent.$JS_OBJECT_NAME)
+{
+$response
+parent.$JS_OBJECT_NAME.show_attachment_form(false);
+}
+</script>
+</html>
+EOF;
+exit;
+
+?>
\ No newline at end of file
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
new file mode 100644
index 000000000..8b8c90cd1
--- /dev/null
+++ b/program/steps/mail/viewsource.inc
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/viewsource.inc                                     |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | All rights reserved.                                                  |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Display a mail message similar as a usual mail application does     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+
+// similar code as in program/steps/mail/get.inc
+if ($_GET['_uid'])
+  {
+  header('Content-Type: text/plain');
+  print rcmail_message_source($_GET['_uid']);
+  }
+else
+  {
+  raise_error(array('code' => 500,
+                    'type' => 'php',
+                    'message' => 'Message UID '.$_GET['_uid'].' not found'),
+              TRUE,
+              TRUE);
+  }
+
+exit;
+?>
\ No newline at end of file