diff --git a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/GeneralPreferences.java b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/GeneralPreferences.java
index 2046772..f520915 100644
--- a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/GeneralPreferences.java
+++ b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/GeneralPreferences.java
@@ -9,12 +9,16 @@
 package com.google.eclipse.terminal.local.ui.preferences;
 
 import static com.google.eclipse.terminal.local.Activator.preferenceStore;
-import static com.google.eclipse.terminal.local.ui.preferences.PreferenceNames.CLOSE_VIEW_ON_EXIT;
+import static com.google.eclipse.terminal.local.ui.preferences.PreferenceNames.*;
 
 /**
  * @author alruiz@google.com (Alex Ruiz)
  */
 public final class GeneralPreferences {
+  public static boolean bufferLineCount() {
+    return preferenceStore().getBoolean(BUFFER_LINE_COUNT);
+  }
+
   public static boolean closeViewOnExit() {
     return preferenceStore().getBoolean(CLOSE_VIEW_ON_EXIT);
   }
diff --git a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceInitializer.java b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceInitializer.java
index e38fa42..d598e9a 100644
--- a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceInitializer.java
+++ b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceInitializer.java
@@ -21,6 +21,7 @@
  */
 public class PreferenceInitializer extends AbstractPreferenceInitializer {
   @Override public void initializeDefaultPreferences() {
+    preferenceStore().setDefault(BUFFER_LINE_COUNT, 1000);
     preferenceStore().setDefault(CLOSE_VIEW_ON_EXIT, true);
     setDefault(BACKGROUND_COLOR, new RGB(0, 0, 0));
     setDefault(FOREGROUND_COLOR, new RGB(229, 229, 229));
diff --git a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceNames.java b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceNames.java
index f554363..4dea3b0 100644
--- a/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceNames.java
+++ b/com.google.eclipse.terminal.local/src/com/google/eclipse/terminal/local/ui/preferences/PreferenceNames.java
@@ -12,6 +12,7 @@
  * @author alruiz@google.com (Alex Ruiz)
  */
 final class PreferenceNames {
+  static final String BUFFER_LINE_COUNT = "bufferLineCount";
   static final String CLOSE_VIEW_ON_EXIT = "exitViewOnExit";
   static final String BACKGROUND_COLOR = "backgroundColor";
   static final String FOREGROUND_COLOR = "foregroundColor";