diff --git a/src/ExportCsvDialog.cpp b/src/ExportCsvDialog.cpp
index adeb053a..c97beadf 100644
--- a/src/ExportCsvDialog.cpp
+++ b/src/ExportCsvDialog.cpp
@@ -6,6 +6,7 @@
 #include "ui_ExportCsvDialog.h"
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
+#include "sqlitetablemodel.h"
 
 ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent)
     : QDialog(parent),
@@ -39,7 +40,10 @@ void ExportCsvDialog::accept()
     if(fileName.size() > 0)
     {
         // Get data from selected table
-        pdb->browseTable(ui->comboTable->currentText());
+        SqliteTableModel tableModel(this, pdb);
+        tableModel.setTable(ui->comboTable->currentText());
+        while(tableModel.canFetchMore())
+            tableModel.fetchMore();
 
         // Prepare the quote and separating characters
         QString quoteChar = ui->comboQuoteCharacter->currentText();
@@ -58,11 +62,10 @@ void ExportCsvDialog::accept()
             // Put field names in first row if user wants to have them
             if(ui->checkHeader->isChecked())
             {
-                QStringList fields = pdb->browseFields;
-                for(int i=0;i<fields.count();i++)
+                for(int i=1;i<tableModel.columnCount();i++)
                 {
-                    stream << quoteChar << fields.at(i) << quoteChar;
-                    if(i < fields.count() - 1)
+                    stream << quoteChar << tableModel.headerData(i, Qt::Horizontal).toString() << quoteChar;
+                    if(i < tableModel.columnCount() - 1)
                         stream << sepChar;
                     else
                         stream << newlineChar;
@@ -70,15 +73,13 @@ void ExportCsvDialog::accept()
             }
 
             // Get and write actual data
-            rowList data = pdb->browseRecs;
-            for(int i=0;i<data.size();i++)
+            for(int i=0;i<tableModel.totalRowCount();i++)
             {
-                QList<QByteArray> row = data[i];
-                for(int j=1;j<row.size();j++)
+                for(int j=1;j<tableModel.columnCount();j++)
                 {
-                    QString content = row[j];
+                    QString content = tableModel.data(tableModel.index(i, j)).toString();
                     stream << quoteChar << content.replace(quoteChar, quotequoteChar) << quoteChar;
-                    if(j < row.count() - 1)
+                    if(j < tableModel.columnCount() - 1)
                         stream << sepChar;
                     else
                         stream << newlineChar;
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index 38d2a3b6..2abfca85 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -476,7 +476,6 @@ bool DBBrowserDB::browseTable( const QString & tablename, const QString& /*order
     QStringList testFields = getTableFields( tablename );
     
     if (testFields.count()>0) {//table exists
-        //getTableRecords( tablename, orderby );
         browseFields = testFields;
         hasValidBrowseSet = true;
         curBrowseTableName = tablename;
diff --git a/src/sqlitetablemodel.h b/src/sqlitetablemodel.h
index 5a3e1172..3cecacca 100644
--- a/src/sqlitetablemodel.h
+++ b/src/sqlitetablemodel.h
@@ -15,7 +15,7 @@ public:
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int totalRowCount() const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
     bool canFetchMore(const QModelIndex &parent = QModelIndex()) const;