diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
@@ -67,7 +67,6 @@
 import javax.swing.event.TableModelListener;
 import javax.swing.plaf.UIResource;
 import javax.swing.table.*;
-import org.jdesktop.swingx.JXTable;
 import org.jdesktop.swingx.JXTableHeader;
 import org.jdesktop.swingx.decorator.ColorHighlighter;
 import org.jdesktop.swingx.decorator.HighlightPredicate;
@@ -76,6 +75,7 @@
 import org.jdesktop.swingx.renderer.JRendererCheckBox;
 import org.jdesktop.swingx.renderer.StringValues;
 import org.netbeans.modules.db.dataview.meta.DBColumn;
+import org.netbeans.modules.db.dataview.options.DataViewSettings;
 import org.netbeans.modules.db.dataview.table.celleditor.*;
 import org.netbeans.modules.db.dataview.util.BinaryToStringConverter;
 import org.netbeans.modules.db.dataview.util.DataViewUtils;
@@ -470,7 +470,7 @@
          */
         @Override
         protected Transferable createTransferable(JComponent c) {
-            return createTransferableTSV(false);
+            return createTransferableTSV(DataViewSettings.getCopyRowValuesWithHeaders());
         }
 
         @Override