diff --git a/CHANGELOG b/CHANGELOG
index 7874b1b6c..37f4857ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - pass access object to view in out.ReviewDocument.php (Bug #191)
 - unset expiration date works again
 - complete revised italian translate (Thanks to Diego Fiorani)
+- preset expiration date for documents in settings
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.13
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 874a79811..94953089b 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -123,6 +123,8 @@ class Settings { /* {{{ */
 	var $_enableDuplicateDocNames = true;
 	// enable/disable notification when added as a reviewer/approver
 	var $_enableNotificationAppRev = true;
+	// preset expiration date
+	var $_presetExpirationDate = "";
 	// the name of the versioning info file created by the backup tool
 	var $_versioningFileName = "versioning_info.txt";
 	// the mode of workflow
@@ -470,6 +472,7 @@ class Settings { /* {{{ */
 		$this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]);
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
+		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
 		$this->_workflowMode = strval($tab["workflowMode"]);
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
@@ -720,7 +723,9 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp);
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
+    $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
+    $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 428d806f5..190f95c46 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -816,7 +816,7 @@ URL: [url]',
 'settings_enableConverting' => 'Activer conversion des fichiers',
 'settings_enableConverting_desc' => 'Activer/Désactiver la conversion des fichiers',
 'settings_enableDropUpload' => 'Activer la publication rapide de documents',
-'settings_enableDropUpload_desc' => 'Activer/Désactiver la zone de glisser/    déposer sur la page d\\'un dossier.',
+'settings_enableDropUpload_desc' => 'Activer/Désactiver la zone de glisser/    déposer sur la page d\'un dossier.',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
 'settings_enableEmail' => 'E-mails',
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 3c0938287..b34fd2a68 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -537,9 +537,14 @@ switch($command) {
 
 				$workflow = $user->getMandatoryWorkflow();
 
+				$expires = false;
+				if($settings->_presetExpirationDate) {
+					$expires = strtotime($settings->_presetExpirationDate);
+				}
+
 				$cats = array();
 
-				$res = $folder->addDocument($name, '', false, $user, '',
+				$res = $folder->addDocument($name, '', $expires, $user, '',
 																		array(), $userfiletmp, basename($userfilename),
 																		$fileType, $userfiletype, 0,
 																		$reviewers, $approvers, 1,
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 48ec6942e..95a7f2aaa 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -140,6 +140,7 @@ if ($action == "saveSettings")
 
   // SETTINGS - ADVANCED - EDITION
   $settings->_versioningFileName = $_POST["versioningFileName"];
+  $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
   $settings->_workflowMode = $_POST["workflowMode"];
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 9ed9b34e4..82a0e164c 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -46,7 +46,7 @@ if($settings->_quota > 0) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index bda850df9..02a4eed8f 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -42,6 +42,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
+		$presetexpiration = $this->params['presetexpiration'];
 		$folderid = $folder->getId();
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
@@ -150,16 +151,22 @@ $(document).ready(function() {
 <?php
 				}
 			}
+			if($presetexpiration) {
+				if(!($expts = strtotime($presetexpiration)))
+					$expts = time();
+			} else {
+				$expts = time();
+			}
 ?>
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
         <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y'); ?>">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
         </span>&nbsp;
         <label class="checkbox inline">
-				  <input type="checkbox" name="expires" value="false" checked><?php printMLText("does_not_expire");?>
+					<input type="checkbox" name="expires" value="false" <?php echo  ($presetexpiration ? "" : "checked");?>><?php printMLText("does_not_expire");?>
         </label>
 			</td>
 		</tr>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 105a75610..05a9279f0 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -468,6 +468,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_versioningFileName");?>:</td>
         <td><input type="text" name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_presetExpirationDate_desc");?>">
+        <td><?php printMLText("settings_presetExpirationDate");?>:</td>
+        <td><input name="presetExpirationDate" type="text" value="<?php echo $settings->_presetExpirationDate; ?>" /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
         <td><?php printMLText("settings_enableAdminRevApp");?>:</td>
         <td><input name="enableAdminRevApp" type="checkbox" <?php if ($settings->_enableAdminRevApp) echo "checked" ?> /></td>