diff --git a/filemanager/inc/hook_add_def_pref.inc.php b/filemanager/inc/hook_add_def_pref.inc.php
new file mode 100755
index 0000000000..ae62df7700
--- /dev/null
+++ b/filemanager/inc/hook_add_def_pref.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+global $pref;
+
+$pref->change ("phpwebhosting", "name", "True");
+$pref->change ("phpwebhosting", "mime_type", "True");
+$pref->change ("phpwebhosting", "size", "True");
+$pref->change ("phpwebhosting", "created", "True");
+$pref->change ("phpwebhosting", "modified", "True");
+//$pref->change ("phpwebhosting", "owner", "False");
+$pref->change ("phpwebhosting", "createdby_id", "True");
+$pref->change ("phpwebhosting", "modifiedby_id", "True");
+//$pref->change ("phpwebhosting", "app", "False");
+$pref->change ("phpwebhosting", "comment", "True");
+//$pref->change ("phpwebhosting", "viewinnewwin", "False");
+//$pref->change ("phpwebhosting", "viewonserver", "False");
+//$pref->change ("phpwebhosting", "dotdot", "False");
+//$pref->change ("phpwebhosting", "dotfiles", "False");
+
+?>
diff --git a/filemanager/inc/hook_phpwebhosting_add_def_pref.inc.php b/filemanager/inc/hook_phpwebhosting_add_def_pref.inc.php
deleted file mode 100755
index f505705f1f..0000000000
--- a/filemanager/inc/hook_phpwebhosting_add_def_pref.inc.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-global $pref;
-
-$pref->change ("phpwebhosting", "filename", "True");
-$pref->change ("phpwebhosting", "mime_type", "True");
-$pref->change ("phpwebhosting", "size", "True");
-$pref->change ("phpwebhosting", "created", "True");
-$pref->change ("phpwebhosting", "modified", "True");
-$pref->change ("phpwebhosting", "owner", "False");
-$pref->change ("phpwebhosting", "createdby", "True");
-$pref->change ("phpwebhosting", "modifiedby", "True");
-$pref->change ("phpwebhosting", "app", "False");
-$pref->change ("phpwebhosting", "comment", "True");
-$pref->change ("phpwebhosting", "dotdot", "False");
-$pref->change ("phpwebhosting", "dotfiles", "True");
-
-?>
diff --git a/filemanager/inc/html.inc.php b/filemanager/inc/html.inc.php
index 62e17323dc..05f9fe1f20 100755
--- a/filemanager/inc/html.inc.php
+++ b/filemanager/inc/html.inc.php
@@ -267,7 +267,7 @@ function html_page_error ($errorwas = NULL, $title = "Error", $return = 0)
 		return ($rstring);
 }
 
-function html_link ($href = NULL, $text = NULL, $return = 0, $encode = 1, $linkonly = 0)
+function html_link ($href = NULL, $text = NULL, $return = 0, $encode = 1, $linkonly = 0, $target = NULL)
 {
 	global $phpgw;
 	global $sep;
@@ -303,7 +303,10 @@ function html_link ($href = NULL, $text = NULL, $return = 0, $encode = 1, $linko
 	}
 	else
 	{
-		$rstring = "<a href=$address>$text</a>";
+		if ($target)
+			$target = "target=$target";
+
+		$rstring = "<a href=$address $target>$text</a>";
 	}
 
 	return (eor ($rstring, $return));
diff --git a/filemanager/preferences.php b/filemanager/preferences.php
index 63bd3f9135..5592b48c88 100644
--- a/filemanager/preferences.php
+++ b/filemanager/preferences.php
@@ -17,7 +17,7 @@
 	/*
 	   To add a preference, just add it here.  Key is internal name, value is displayed name
 	*/
-	$other_checkboxes = array ("dotdot" => "Show ..", "dotfiles" => "Show .files");
+	$other_checkboxes = array ("viewinnewwin" => "View documents in new window", "viewonserver" => "View documents on server (if available)", "dotdot" => "Show ..", "dotfiles" => "Show .files");
 
 	if ($submit)
 	{