diff --git a/window.cpp b/window.cpp
index 074299d..4ba4ef3 100644
--- a/window.cpp
+++ b/window.cpp
@@ -56,6 +56,7 @@ Window::Window()
     filterSyntaxLabel->setBuddy(filterSyntaxComboBox);

     filterColumnComboBox = new QComboBox;
+    filterColumnComboBox->addItem(tr("All Columns"));
     filterColumnComboBox->addItem(tr("Subject"));
     filterColumnComboBox->addItem(tr("Sender"));
     filterColumnComboBox->addItem(tr("Date"));
@@ -126,7 +127,7 @@ void Window::filterRegExpChanged()

 void Window::filterColumnChanged()
 {
-    proxyModel->setFilterKeyColumn(filterColumnComboBox->currentIndex());
+    proxyModel->setFilterKeyColumn(filterColumnComboBox->currentIndex()-1);
 }

 void Window::sortChanged()