diff --git a/default.properties b/default.properties
index a1ef8e9..128c6ef 100644
--- a/default.properties
+++ b/default.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-3
+target=android-7
diff --git a/src/org/yaaic/activity/ConversationActivity.java b/src/org/yaaic/activity/ConversationActivity.java
index 74b1cbd..51f3662 100644
--- a/src/org/yaaic/activity/ConversationActivity.java
+++ b/src/org/yaaic/activity/ConversationActivity.java
@@ -241,6 +241,10 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 				break;
 			case R.id.close:
 				Conversation conversationToClose = deckAdapter.getItem(deck.getSelectedItemPosition());
+				// Make sure we part a channel when closing the channel conversation
+				if(conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
+					binder.getService().getConnection(serverId).partChannel(conversationToClose.getName());
+				}
 				if (conversationToClose.getType() != Conversation.TYPE_SERVER) {
 					onRemoveConversation(conversationToClose.getName());
 				} else {