From da346602e07c2b8bd46598c765c2ca48d1c1aad9 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 17 Jan 2011 16:56:46 +1300
Subject: [PATCH 1/4] Corrects "recent" to "resent" in headers

---
 bounce.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bounce.php b/bounce.php
index d6ffa4c..70f2522 100644
--- a/bounce.php
+++ b/bounce.php
@@ -73,20 +73,20 @@ function request_action() {
     if (!empty($mailbcc))
       $a_recipients['Bcc'] = $mailbcc;
 
-    $recent = array();
-    $recent['From'] = $headers_old->to." <".$headers_old->to.">";
-    $recent['To'] = $mailto;
+    $resent = array();
+    $resent['From'] = $headers_old->to." <".$headers_old->to.">";
+    $resent['To'] = $mailto;
     if (!empty($mailcc))
-      $recent['Cc'] = $mailcc;
+      $resent['Cc'] = $mailcc;
     if (!empty($mailbcc))
-      $recent['Bcc'] = $mailcc;
-    $recent['Message-Id'] = sprintf('<%s@%s>', md5(uniqid('rcmail'.mt_rand(),true)), $rcmail->config->mail_domain($_SESSION['imap_host']));
-    $recent['Date'] = date('r');
+      $resent['Bcc'] = $mailcc;
+    $resent['Message-Id'] = sprintf('<%s@%s>', md5(uniqid('rcmail'.mt_rand(),true)), $rcmail->config->mail_domain($_SESSION['imap_host']));
+    $resent['Date'] = date('r');
     if ($rcmail->config->get('useragent'))
-      $recent['User-Agent'] = $rcmail->config->get('useragent');
+      $resent['User-Agent'] = $rcmail->config->get('useragent');
 
-    foreach($recent as $k=>$v){
-       $recent_headers .= "Recent-$k: $v\n";
+    foreach($resent as $k=>$v){
+       $resent_headers .= "Resent-$k: $v\n";
     }
 
     $rcmail->imap->set_mailbox($mbox);
@@ -94,7 +94,7 @@ function request_action() {
     $msg_body = $rcmail->imap->get_raw_body($msg_uid);
 
     $headers = $rcmail->imap->get_raw_headers($msg_uid);
-    $headers = $recent_headers.$headers;
+    $headers = $resent_headers.$headers;
 
     $a_body = preg_split('/[\r\n]+$/sm', $msg_body);
     $c_body = count($a_body);
@@ -250,4 +250,4 @@ private function rcmail_email_input_format($mailto, $count=false, $check=true) {
 
     return implode(', ', $result);
   }
-}
\ No newline at end of file
+}

From 04e3901a31db1662aa2892292940637b6bcd2b67 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 17 Jan 2011 17:08:41 +1300
Subject: [PATCH 2/4] Hides bounce-box by default

---
 bounce.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bounce.css b/bounce.css
index f9f967f..946324d 100644
--- a/bounce.css
+++ b/bounce.css
@@ -1,6 +1,7 @@
 #bounce-box
 {
   position: absolute;
+  display: none;
   top: 200px;
   left: 250px;
   width: 550px;
@@ -42,4 +43,4 @@
   top: 0px;
   left: 340px;
 }
-*/
\ No newline at end of file
+*/

From 23eadc41d331d4ae0c5efa4af53d9e81ca8adc34 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 17 Jan 2011 17:12:04 +1300
Subject: [PATCH 3/4] Raises z-index to show over message body

---
 bounce.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bounce.css b/bounce.css
index 946324d..9abe4a5 100644
--- a/bounce.css
+++ b/bounce.css
@@ -5,6 +5,7 @@
   top: 200px;
   left: 250px;
   width: 550px;
+  z-index: 99;
 }
 
 .bounce-title

From e779a095582ab0eea35fb3927888463c1591702d Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 17 Jan 2011 17:17:47 +1300
Subject: [PATCH 4/4] Tidys up styles for better visibility

---
 bounce.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bounce.css b/bounce.css
index 9abe4a5..a5c1bec 100644
--- a/bounce.css
+++ b/bounce.css
@@ -1,5 +1,8 @@
 #bounce-box
 {
+  border: 1px solid #c0c0c0;
+  background-color: #eeeeee;
+  color: #777777;
   position: absolute;
   display: none;
   top: 200px;
@@ -10,9 +13,8 @@
 
 .bounce-title
 {
-  height: 15px !important;
-  padding: 5px 0px 10px 0px;
   text-align: center;
+  background-color: #c0c0c0;
   color: #333333;
   font-size: 11px;
   font-weight: bold;