diff --git a/lam/HISTORY b/lam/HISTORY
index 28e123aa..cb372c2c 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -9,6 +9,7 @@ March 2014 4.5
    -> Bind DLZ: support TXT/SRV records
    -> Self Service: added language selection
    -> Custom fields: support help texts
+   -> Support for Oracle databases (orclNetService) (RFE 104)
   - fixed bugs:
    -> PDF export for multiple entries does not work
    -> Personal: fixed photo upload if Imagick is not installed
diff --git a/lam/config/templates/pdf/default.oracleContextType.xml b/lam/config/templates/pdf/default.oracleContextType.xml
new file mode 100644
index 00000000..43c581c5
--- /dev/null
+++ b/lam/config/templates/pdf/default.oracleContextType.xml
@@ -0,0 +1,6 @@
+<pdf type="oracleContextType" filename="printLogo.jpg" headline="Database information">
+	<section name="_oracleService_cn">
+		<entry name="oracleService_orclNetDescString" />
+		<entry name="oracleService_description" />
+	</section>
+</pdf>
\ No newline at end of file
diff --git a/lam/config/templates/profiles/default.oracleContextType b/lam/config/templates/profiles/default.oracleContextType
new file mode 100644
index 00000000..8d1c8b69
--- /dev/null
+++ b/lam/config/templates/profiles/default.oracleContextType
@@ -0,0 +1 @@
+ 
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index f7aa87aa..ac5002e8 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -676,7 +676,11 @@ class lamList {
 
 		echo "<div class=\"ui-tabs-nav " . $this->type . "-bright\">";
 		echo "<div class=\"smallPaddingContent\">\n";
-		echo "<form action=\"list.php?type=" . $this->type . "&amp;norefresh=true\" method=\"post\">\n";
+		$refresh = '&amp;norefresh=true';
+		if (isset($_GET['refresh']) && ($_GET['refresh'] == 'true')) {
+			$refresh = '&amp;refresh=true';
+		}
+		echo "<form action=\"list.php?type=" . $this->type . $refresh . "\" method=\"post\">\n";
 		
 		$container = new htmlTable();
 		$container->addElement(new htmlSubTitle(_('Create PDF file')), true);
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index d5e00bcc..5932b3fa 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -839,7 +839,7 @@ class accountContainer {
 			}
 			// create PDF file
 			if (isset($_POST['accountContainerCreatePDF'])) {
-				metaRefresh('../lists/list.php?printPDF=1&amp;type=' . $this->type . "&amp;PDFSessionID=" . $this->base);
+				metaRefresh('../lists/list.php?printPDF=1&amp;type=' . $this->type . "&amp;refresh=true&amp;PDFSessionID=" . $this->base);
 				exit;
 			}
 			// module actions
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 62144359..527783e6 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -578,3 +578,7 @@ h4.schema_oclass_sub {
 .kolabSharedFolderType-bright { background:#b6eeff !important; }
 .kolabSharedFolderType-dark { background-color:#80e0e1 !important; }
 
+.oracleContextType-border { border-color:#32768b; }
+.oracleContextType-bright { background:#b6eeff !important; }
+.oracleContextType-dark { background-color:#80e0e1 !important; }
+
diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js
index 5d4a1cf3..3e476b32 100644
--- a/lam/templates/lib/500_lam.js
+++ b/lam/templates/lib/500_lam.js
@@ -187,17 +187,19 @@ function profileShowDeleteDialog(title, okText, cancelText, scope, selectFieldNa
 }
 
 /**
- * Shows the dialog to create an automount map.
+ * Shows a simple dialog.
  * 
  * @param title dialog title
  * @param okText text for Ok button
  * @param cancelText text for Cancel button
+ * @param formID form ID
+ * @param dialogDivID ID of div that contains dialog content
  */
-function automountShowNewMapDialog(title, okText, cancelText) {
+function showSimpleDialog(title, okText, cancelText, formID, dialogDivID) {
 	var buttonList = {};
-	buttonList[okText] = function() { document.forms["newAutomountMapDialogForm"].submit(); };
+	buttonList[okText] = function() { document.forms[formID].submit(); };
 	buttonList[cancelText] = function() { jQuery(this).dialog("close"); };
-	jQuery('#newAutomountMapDialog').dialog({
+	jQuery('#' + dialogDivID).dialog({
 		modal: true,
 		title: title,
 		dialogClass: 'defaultBackground',