diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java
index 4524857f..21f304d1 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -178,6 +178,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
     private void appendLogTextAndScroll(String text)
     {
         if(mTxtOrbotLog != null){
+        	
+        	if (mTxtOrbotLog.getText().length() > MAX_LOG_LENGTH)
+        		mTxtOrbotLog.setText("");
+        	
         	mTxtOrbotLog.append(text + "\n");
             final Layout layout = mTxtOrbotLog.getLayout();
             if(layout != null){
diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java
index 834f20d0..36cdf484 100644
--- a/src/org/torproject/android/TorConstants.java
+++ b/src/org/torproject/android/TorConstants.java
@@ -53,4 +53,7 @@ public interface TorConstants {
 	public final static String PREF_DISABLE_NETWORK = "pref_disable_network";
 	
 	public final static String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences";
+	
+	public final static int MAX_LOG_LENGTH = 10000;
+	
 }