From 111495423c46df986f5baef45b4c9495c280cc26 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 14 Mar 2013 23:15:15 +0100
Subject: [PATCH 1/2] Imported mails were deleted the second time the poller
 ran - when moving or deleting of mails was activated.

---
 include/onepoll.php       | 18 +++++++++++-------
 view/theme/vier/style.css |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/onepoll.php b/include/onepoll.php
index d5b1668d4f..bd20cfdb53 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -331,13 +331,17 @@ function onepoll_run(&$argv, &$argc){
 						);
 
 						if(count($r)) {
-							logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG);
-							if($meta->deleted && ! $r[0]['deleted']) {
-								q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
-									dbesc(datetime_convert()),
-									intval($r[0]['id'])
-								);
-							}
+							logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
+
+							// Only delete when mails aren't automatically moved or deleted
+							if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3))
+								if($meta->deleted && ! $r[0]['deleted']) {
+									q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+										dbesc(datetime_convert()),
+										intval($r[0]['id'])
+									);
+								}
+
 							switch ($mailconf[0]['action']) {
 								case 0:
 									logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 1595499ee0..29863e744b 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1117,7 +1117,7 @@ border-bottom: 1px solid #D2D2D2;
   font-size: 14px;
 }
 .wall-item-container .wall-item-bottom {
-  opacity: 0.5;
+  opacity: 0;
   -webkit-transition: all 0.2s ease-in-out;
   -moz-transition: all 0.2s ease-in-out;
   -o-transition: all 0.2s ease-in-out;

From eabefb2f04dd43947ab338e17cff3727f3582237 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 29 Mar 2013 11:18:20 +0100
Subject: [PATCH 2/2] vier: The background color of the right area is now
 white.

---
 view/theme/vier/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 29863e744b..e718c92553 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -291,9 +291,9 @@ blockquote.shared_content {
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
-  /* background-color: #ffffff; */
+  background-color: #ffffff;
   /* background-color: #ddd; */
-  background-color: #F2F2F2;
+  /* background-color: #F2F2F2; */
   color: #2d2d2d;
   /* margin: 37px 0px 0px 0px; */
   margin: 0px 0px 0px 0px;