diff --git a/admin/vvexport.php b/admin/vvexport.php
index ec1f9080148..9bb6cc1391a 100644
--- a/admin/vvexport.php
+++ b/admin/vvexport.php
@@ -69,7 +69,7 @@
 		</tr>
 		 <input type='hidden' name='action' value='export'>
 		</form>
-		<tr><td colspan='2' align='center'>[<a href='$scriptname?sid=4'>"._B_ADMIN_BT."</a>]</td></tr>
+		<tr><td colspan='2' align='center'>[<a href='$scriptname?sid=$sid'>"._B_ADMIN_BT."</a>]</td></tr>
 		</table>";
 	}
 elseif (isset($sid) && $sid)
@@ -114,7 +114,10 @@
 		{
 		foreach ($fieldnames as $field)
 			{
-			echo $row[$field].$s;
+			$value=str_replace("\n", "{newline}", $row[$field]);
+			$value=str_replace("\r", "", $value);
+			$value=str_replace("\t", "{tab}", $value);
+			echo $value.$s;
 			}
 		echo "\n";
 		}
diff --git a/admin/vvimport.php b/admin/vvimport.php
index 26ef6337a34..e05b46dde34 100644
--- a/admin/vvimport.php
+++ b/admin/vvimport.php
@@ -103,7 +103,7 @@
 	$handle = fopen($the_full_file_path, "r");
 	while (!feof($handle))
 		{
-		$buffer = fgets($handle, 10240); //To allow for very long lines (up to 10k)
+		$buffer = fgets($handle, 20480); //To allow for very long lines (up to 10k)
 		$bigarray[] = $buffer;
 		}
 	fclose($handle);
@@ -150,7 +150,7 @@
 		if (trim($row) != "")
 			{
 			$fieldvalues=explode("\t", mysql_escape_string(str_replace("\n", "", $row)), $fieldcount+1);
-			if (isset($donotimport))
+			if (isset($donotimport)) //remove any fields which no longer exist
 				{
 				foreach ($donotimport as $not)
 					{
@@ -174,7 +174,7 @@
 	echo "<font color='green'>"._SUCCESS."</font>
 		  File upload completed.<br /><br />
 		  <i>Note: Do NOT refresh this page</i><br /><br />";
-	echo "[<a href='$scriptname?sid=4'>"._B_ADMIN_BT."</a>]";
+	echo "[<a href='browse.php?sid=$sid'>"._BROWSERESPONSES."</a>]";
 	echo "</td></tr></table>";
 	}
 ?>
\ No newline at end of file