From e55d3019c3b562455123a0372c5b2e6eefcdc22b Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Thu, 6 May 2010 13:24:13 +0000
Subject: [PATCH] Really fix this (I hope) based on more feedback from cketti.

---
 src/com/fsck/k9/MessagingController.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java
index d313449af..5946a5ffa 100644
--- a/src/com/fsck/k9/MessagingController.java
+++ b/src/com/fsck/k9/MessagingController.java
@@ -4718,15 +4718,14 @@ public class MessagingController implements Runnable
                         return false;
                     }
                     Pusher pusher = store.getPusher(receiver);
-                    Pusher oldPusher = null;
                     if (pusher != null)
                     {
-                        oldPusher = pushers.putIfAbsent(account, pusher);
-                    }
-                    if (oldPusher == null)
-                    {
-                        pusher.start(names);
-                    }
+			Pusher oldPusher  = pushers.putIfAbsent(account, pusher);
+			if (oldPusher == null)
+			{
+			    pusher.start(names);
+			}
+		    }
                 }
                 catch (Exception e)
                 {