diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
index a206380345048..e26408488547c 100644
--- a/apps/files_sharing/lib/Controller/ShareesAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -423,16 +423,16 @@ public function search($search = '', $itemType = null, $page = 1, $perPage = 200
 
 		$shareTypes = [
 			Share::SHARE_TYPE_USER,
+			Share::SHARE_TYPE_EMAIL,
+			Share::SHARE_TYPE_REMOTE
 		];
 
 		if ($this->shareManager->allowGroupSharing()) {
 			$shareTypes[] = Share::SHARE_TYPE_GROUP;
 		}
 
-		$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-
-		if (is_array($shareType)) {
-			$shareTypes = array_intersect($shareTypes, $shareType);
+		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
 			sort($shareTypes);
 		} else if (is_numeric($shareType)) {
 			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
@@ -499,6 +499,10 @@ protected function searchSharees($search, $itemType, array $shareTypes, $page, $
 			$this->getRemote($search);
 		}
 
+		if (in_array(Share::SHARE_TYPE_EMAIL, $shareTypes)) {
+			$this->getEmail($search);
+		}
+
 		$response = new Http\DataResponse($this->result);
 
 		if (sizeof($this->reachedEndFor) < 3) {
@@ -513,6 +517,25 @@ protected function searchSharees($search, $itemType, array $shareTypes, $page, $
 		return $response;
 	}
 
+	/**
+	 * add option to send share by mail
+	 *
+	 * @param string $search
+	 */
+	protected function getEmail($search) {
+		$this->result['emails'] = [];
+
+		if (substr_count($search, '@') >= 1 && substr_count($search, ' ') === 0 && $this->offset === 0) {
+			$this->result['exact']['emails'][] = [
+				'label' => $search,
+				'value' => [
+					'shareType' => Share::SHARE_TYPE_EMAIL,
+					'shareWith' => $search,
+				],
+			];
+		}
+	}
+
 	/**
 	 * Generates a bunch of pagination links for the current page
 	 *
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2c60f216ef948..ffce420f6553c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -154,10 +154,12 @@
 						var users   = result.ocs.data.exact.users.concat(result.ocs.data.users);
 						var groups  = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
 						var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes);
+						var emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails);
 
 						var usersLength;
 						var groupsLength;
 						var remotesLength;
+						var emailsLength;
 
 						var i, j;
 
@@ -212,10 +214,18 @@
 										break;
 									}
 								}
+							} else if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
+							emailsLength = emails.length;
+							for (j = 0; j < emailsLength; j++) {
+								if (emails[j].value.shareWith === share.share_with) {
+									emails.splice(j, 1);
+									break;
+								}
 							}
 						}
+						}
 
-						var suggestions = users.concat(groups).concat(remotes);
+						var suggestions = users.concat(groups).concat(remotes).concat(emails);
 
 						if (suggestions.length > 0) {
 							$('.shareWithField').removeClass('error')
@@ -268,6 +278,10 @@
 						sharee: text
 					});
 				}
+			} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
+				text = t('core', '{sharee} (email)', {
+					sharee: text
+				});
 			}
 			insert.text(text);
 			insert.attr('title', item.value.shareWith);
@@ -392,7 +406,7 @@
 				var infoTemplate = this._getRemoteShareInfoTemplate();
 				remoteShareInfo = infoTemplate({
 					docLink: this.configModel.getFederatedShareDocLink(),
-					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
+					tooltip: t('core', 'Share with people on other servers using the syntax username@example.com/owncloud')
 				});
 			}
 
@@ -400,16 +414,16 @@
 		},
 
 		_renderSharePlaceholderPart: function () {
-			var sharePlaceholder = t('core', 'Share with users…');
+			var sharePlaceholder = t('core', 'Share with users, or by mail...');
 
 			if (this.configModel.get('allowGroupSharing')) {
 				if (this.configModel.get('isRemoteShareAllowed')) {
-					sharePlaceholder = t('core', 'Share with users, groups or remote users…');
+					sharePlaceholder = t('core', 'Share with users, groups, remote users, or by mail…');
 				} else {
-					sharePlaceholder = t('core', 'Share with users or groups…');
+					sharePlaceholder = t('core', 'Share with users, groups or by mail...');
 				}
 			} else if (this.configModel.get('isRemoteShareAllowed')) {
-					sharePlaceholder = t('core', 'Share with users or remote users…');
+					sharePlaceholder = t('core', 'Share with users, remote users or by mail...');
 			}
 
 			return sharePlaceholder;
diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php
index 13a5a044e8a32..f13f83f8ba9aa 100644
--- a/lib/private/Share/Constants.php
+++ b/lib/private/Share/Constants.php
@@ -29,9 +29,9 @@ class Constants {
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
 	const SHARE_TYPE_LINK = 3;
-	const SHARE_TYPE_EMAIL = 4;   // ToDo Check if it is still in use otherwise remove it
+	const SHARE_TYPE_EMAIL = 4;
 	const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it
-	const SHARE_TYPE_REMOTE = 6;  // ToDo Check if it is still in use otherwise remove it
+	const SHARE_TYPE_REMOTE = 6;
 
 	const FORMAT_NONE = -1;
 	const FORMAT_STATUSES = -2;