diff --git a/src/com/hectorone/multismssender/MultiSmsSender.java b/src/com/hectorone/multismssender/MultiSmsSender.java
index 7546b4c..f95cf28 100644
--- a/src/com/hectorone/multismssender/MultiSmsSender.java
+++ b/src/com/hectorone/multismssender/MultiSmsSender.java
@@ -5,8 +5,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 
-
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -20,7 +18,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.telephony.PhoneNumberUtils;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -60,6 +57,8 @@ public class MultiSmsSender extends Activity {
 	public static final String PARAM_ENTRY_ID = "entry_id";
 
 	public static final String DEBUG_TAG="MultiSmsSender";
+	
+	private boolean appli_running = true;
 
 	MessageSenderThread mThreadSender;
 	private boolean mManyMessageContinue;
@@ -70,7 +69,7 @@ public class MultiSmsSender extends Activity {
 			switch (type) {
 			case DIALOG_PROGRESS:{
 				int total = msg.getData().getInt("total");
-				Log.d(DEBUG_TAG, "========= total is "+total);
+				//Log.d(DEBUG_TAG, "========= total is "+total);
 				mSendingDialog.setProgress(total);
 			}
 			break;
@@ -172,7 +171,8 @@ public class MultiSmsSender extends Activity {
 		mDeliveryCheckBox = (CheckBox) findViewById(R.id.deliveryCheckBox);
 
 		mContacts.setImeOptions(EditorInfo.IME_ACTION_NEXT);
-		mEditor.setImeOptions(EditorInfo.IME_ACTION_DONE);
+//		mEditor.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
 
 		mAddButton.setOnClickListener(new OnClickListener() {
 
@@ -287,7 +287,7 @@ public class MultiSmsSender extends Activity {
 						}
 
 					}
-					Log.d(DEBUG_TAG, "size is"+size+" message_sent "+message_sent+" max"+chunk_max);
+					//Log.d(DEBUG_TAG, "size is"+size+" message_sent "+message_sent+" max"+chunk_max);
 					for(int i = message_sent; i < chunk_max; i++) {
 						message_sent ++;
 						String newN = numbers[i].trim();
@@ -317,7 +317,7 @@ public class MultiSmsSender extends Activity {
 									getContentResolver().insert(Uri.parse("content://sms/sent"), values);
 
 									long entryId = mDbHelper.createEntry(mDbHelper.nameFromNumber(newN), newN, deliveryId);
-									Log.d(DEBUG_TAG, "entry is "+entryId+" to number"+newN);
+									//Log.d(DEBUG_TAG, "entry is "+entryId+" to number"+newN);
 									for (int j = 0; j < messageCount; j++) {
 										Uri entryURI = Uri.withAppendedPath(EntryContentProvider.CONTENT_URI, ""+entryId);
 										Intent intent = new Intent(MessageReceiver.MESSAGE_RECEIVED,entryURI, this, MessageReceiver.class);
@@ -336,7 +336,7 @@ public class MultiSmsSender extends Activity {
 					}
 					chunk_max = Math.min(message_sent +MANY_MESSAGE, size);
 
-				} while ( (size - message_sent) >0);
+				} while ( ((size - message_sent) >0) && appli_running );
 			}
 			Message msg = handler.obtainMessage();
 			Bundle b = new Bundle();
@@ -441,6 +441,7 @@ public class MultiSmsSender extends Activity {
 	}
 
 	protected void onDestroy() {
+		appli_running = false;
 		mDbHelper.close();
 		super.onDestroy();
 	}