From b04fd2337ef1e37309f634f41b0d07f16f4e64ab Mon Sep 17 00:00:00 2001
From: Alethea Butler <alethea@alethea.io>
Date: Sat, 31 May 2014 11:50:09 -0400
Subject: [PATCH] Refactored into onNavigateUp

---
 .../conversations/ui/ManageAccountActivity.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 6fd87473c..c61c1b82c 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -398,18 +398,23 @@ public class ManageAccountActivity extends XmppActivity {
 		case R.id.action_add_account:
 			addAccount();
 			break;
-		case android.R.id.home:
-			if (xmppConnectionService.getConversations().size() == 0) {
-				startActivity(new Intent(getApplicationContext(),
-						ContactsActivity.class));
-			}
-			break;
 		default:
 			break;
 		}
 		return super.onOptionsItemSelected(item);
 	}
 
+	@Override
+	public boolean onNavigateUp() {
+		if (xmppConnectionService.getConversations().size() == 0) {
+			startActivity(new Intent(this, ContactsActivity.class));
+			finish();
+			return true;
+		} else {
+			return super.onNavigateUp();
+		}
+	}
+
 	private void editAccount(Account account) {
 			EditAccount dialog = new EditAccount();
 			dialog.setAccount(account);