diff --git a/api/src/Contacts/Storage.php b/api/src/Contacts/Storage.php
index f91509f84a..5ea1b43f3a 100755
--- a/api/src/Contacts/Storage.php
+++ b/api/src/Contacts/Storage.php
@@ -323,18 +323,14 @@ class Storage
 			)));
 		}
 
-		// Add in deleted type, if holding deleted contacts
-		$config = Api\Config::read('phpgwapi');
-		if($config['history'])
-		{
-			$this->content_types[self::DELETED_TYPE] = array(
-				'name'	=>	lang('Deleted'),
-				'options' =>	array(
-					'template'	=>	'addressbook.edit',
-					'icon'		=>	'deleted.png'
-				)
-			);
-		}
+		// Always add in deleted type, to show deleted contacts
+		$this->content_types[self::DELETED_TYPE] = array(
+			'name'	=>	lang('Deleted'),
+			'options' =>	array(
+				'template'	=>	'addressbook.edit',
+				'icon'		=>	'deleted.png'
+			)
+		);
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 5415212487..dae2bbee05 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1906,7 +1906,7 @@ class calendar_boupdate extends calendar_bo
 				// delete all links to the event
 				Link::unlink(0,'calendar',$cal_id);
 			}
-			elseif ($config['calendar_delete_history'])
+			else
 			{
 				// mark all links to the event as deleted, but keep them
 				Link::unlink(0,'calendar',$cal_id,'','','',true);
diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index 8dd9e04688..a0acf1f83d 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -1960,6 +1960,9 @@ class infolog_bo
 				$labels = implode(', ', $labels);
 			}
 		}
+		// always add deleted status
+		$statis['deleted'] = 'deleted';
+
 		return $statis;
 	}
 
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 3bc4ee7c89..de81dda901 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -532,10 +532,6 @@ class infolog_ui
 		// if filtered by type, show only the stati of the filtered type
 		$rows['sel_options']['info_status'] = $this->bo->get_status($query['col_filter']['info_type']);
 
-		if ($this->bo->history)
-		{
-			$rows['sel_options']['info_status']['deleted'] = 'deleted';
-		}
 		// Update actions for selected type / status / etc.
 		$query['actions'] = $this->get_actions($query);