diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 1a966ac192be..ba227e810cbd 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -1,104 +1,99 @@
 .app-files .shareTabView {
-  min-height: 100px;
+	min-height: 100px;
 }
 
 .shareTabView .oneline {
-  white-space: nowrap;
+	white-space: nowrap;
 }
 
 .shareTabView .shareWithLoading {
-  padding-left: 10px;
-  right: 30px;
-  top: 2px;
+	padding-left: 10px;
+	right: 30px;
+	top: 2px;
 }
 
 .shareTabView label {
-  white-space: nowrap;
+	white-space: nowrap;
 }
 
 .shareTabView input[type="checkbox"] {
-  margin: 0 3px 0 8px;
-  vertical-align: middle;
+	margin: 0 3px 0 8px;
+	vertical-align: middle;
 }
 
-.shareTabView input[type="text"],
-.shareTabView input[type="password"] {
-  width: 94%;
-  margin-left: 0;
+.shareTabView input[type="text"], .shareTabView input[type="password"] {
+	width: 94%;
+	margin-left: 0;
 }
 
-.shareTabView input[type="text"].shareWithField,
-.shareTabView input[type="text"].emailField,
-.shareTabView input[type="text"].linkText {
-  width: 80%;
+.shareTabView input[type="text"].shareWithField, .shareTabView input[type="text"].emailField, .shareTabView input[type="text"].linkText {
+	width: 80%;
 }
 
 .shareTabView form {
-  font-size: 100%;
-  margin-left: 0;
-  margin-right: 0;
+	font-size: 100%;
+	margin-left: 0;
+	margin-right: 0;
 }
 
 #shareWithList {
-  list-style-type: none;
-  padding: 0 0 16px;
+	list-style-type: none;
+	padding: 0 0 16px;
 }
 
 #shareWithList li {
-  padding-top: 5px;
-  padding-bottom: 5px;
-  font-weight: bold;
-  white-space: normal;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	font-weight: bold;
+	white-space: normal;
 }
 
-#shareWithList .unshare img,
-#shareWithList .showCruds img {
-  vertical-align: text-bottom;
-  /* properly align icons */
+#shareWithList .unshare img, #shareWithList .showCruds img {
+	vertical-align: text-bottom;
+	/* properly align icons */
 }
 
 #shareWithList label input[type=checkbox] {
-  margin-left: 0;
-  position: relative;
+	margin-left: 0;
+	position: relative;
 }
 
 #shareWithList .username {
-  padding-right: 8px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  max-width: 254px;
-  display: inline-block;
-  overflow: hidden;
-  vertical-align: middle;
+	padding-right: 8px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	max-width: 254px;
+	display: inline-block;
+	overflow: hidden;
+	vertical-align: middle;
 }
 
 #shareWithList li label {
-  margin-right: 8px;
+	margin-right: 8px;
 }
 
 .shareTabView .icon-loading-small {
-  display: inline-block;
-  z-index: 1;
-  background-color: white;
-  padding: 2px 0;
+	display: inline-block;
+	z-index: 1;
+	background-color: white;
+	padding: 2px 0;
 }
 
-.shareTabView .shareWithList .icon-loading-small,
-.shareTabView .linkShareView .icon-loading-small {
-  position: absolute;
+.shareTabView .shareWithList .icon-loading-small, .shareTabView .linkShareView .icon-loading-small {
+	position: absolute;
 }
 
 .shareTabView .linkPass .icon-loading-small {
-  margin-top: 9px;
+	margin-top: 9px;
 }
 
 .shareTabView .icon {
-  display: inline-block;
-  background-size: 16px 16px;
+	display: inline-block;
+	background-size: 16px 16px;
 }
 
 .shareTabView .privacyWarningMessage {
-  margin-top: 20px;
+	margin-top: 20px;
 }
 
 .shareTabView .shareWithList .mailNotificationSpinner {
@@ -108,172 +103,187 @@
 }
 
 .subTabHeaders .tabHeaders {
-  margin-left: 0px;
-  margin-right: 0px;
+	margin-left: 0px;
+	margin-right: 0px;
 }
 
 .link-shares {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
 
 .link-entry {
-  display: flex;
-  align-items: center;
-  min-height: 50px;
-  position: relative;
+	display: flex;
+	align-items: center;
+	min-height: 50px;
+	position: relative;
 }
 
 .link-entry:not(:last-child) {
-  border-bottom: 1px solid #eee;
+	border-bottom: 1px solid #eee;
 }
 
 .link-entry .socialShareContainer {
-  position: absolute;
-  right: 0;
-  top: -20px;
-  background-color: rgba(0, 0, 0, 0.5);
-  padding: 0 2px 2px 5px;
-  border-radius: 3px;
+	position: absolute;
+	right: 0;
+	top: -20px;
+	background-color: rgba(0, 0, 0, 0.5);
+	padding: 0 2px 2px 5px;
+	border-radius: 3px;
 }
 
 .link-entry--icon {
-  height: 32px;
-  width: 32px;
-  background-color: #b4b4b4;
-  background-position: 8px 8px;
-  border-radius: 50%;
-  margin-right: 10px;
+	height: 32px;
+	width: 32px;
+	background-color: #b4b4b4;
+	background-position: 8px 8px;
+	border-radius: 50%;
+	margin-right: 10px;
 }
 
 .link-entry--title {
-  flex-grow: 1;
-  font-weight: bold;
+	flex-grow: 1;
+	font-weight: bold;
 }
 
 .link-entry--icon-button {
-  margin-left: 5px;
-  opacity: .333;
-  -webkit-transition: opacity .25s;
-  -moz-transition: opacity .25s;
-  -ms-transition: opacity .25s;
-  -o-transition: opacity .25s;
-  transition: opacity .25s;
+	margin-left: 5px;
+	opacity: .333;
+	-webkit-transition: opacity .25s;
+	-moz-transition: opacity .25s;
+	-ms-transition: opacity .25s;
+	-o-transition: opacity .25s;
+	transition: opacity .25s;
 }
 
 .link-entry--icon-button:hover {
-  opacity: 1;
+	opacity: 1;
 }
 
 .link-entry--icon-button span {
-  cursor: pointer;
+	cursor: pointer;
 }
 
 /* -------------------------------------------------- USER & GROUP SHARES --- */
+
 .user-shares {
-  margin: 20px -15px;
+	margin: 20px -15px;
 }
 
 .user-share {
-  transition: all 0.25s ease;
-  padding: 0 15px;
+	transition: all 0.25s ease;
+	padding: 0 15px;
 }
 
 .user-share .icon-settings-dark {
-  transition: all 0.25s ease;
-  opacity: .25;
+	transition: all 0.25s ease;
+	opacity: .25;
 }
 
-.user-share.-active,
-.user-share:hover {
-  background-color: #eee;
+.user-share.-active, .user-share:hover {
+	background-color: #eee;
 }
 
-.user-share.-active .icon-settings-dark,
-.user-share:hover .icon-settings-dark {
-  opacity: .25;
+.user-share.-active .icon-settings-dark, .user-share:hover .icon-settings-dark {
+	opacity: .25;
 }
 
 .user-share.-active .user-share--dropdown {
-  height: 30px;
+	height: 30px;
 }
 
 .user-share:not(:last-child) {
-  border-bottom: 1px solid #eee;
+	border-bottom: 1px solid #eee;
 }
 
 .user-share .icon-settings-dark {
-  opacity: 0;
+	opacity: 0;
 }
 
 .user-share--user {
-  display: flex;
-  align-items: center;
+	display: flex;
+	align-items: center;
 }
 
 .user-share--title {
-  font-weight: bold;
-  margin-right: 5px;
+	font-weight: bold;
+	margin-right: 5px;
 }
 
 .user-share--main {
-  display: flex;
-  align-items: center;
-  min-height: 50px;
-  justify-content: space-between;
+	display: flex;
+	align-items: center;
+	min-height: 50px;
+	justify-content: space-between;
 }
 
 .user-share--checkbox:not(:first-child) {
-  margin-left: 5px;
+	margin-left: 5px;
 }
 
 .user-share--dropdown {
-  overflow: hidden;
-  height: 0;
-  transition: height 0.25s ease-in-out;
-  display: flex;
-  justify-content: space-between;
+	overflow: hidden;
+	height: 0;
+	transition: height 0.25s ease-in-out;
+	display: flex;
+	justify-content: space-between;
 }
+
 .user-share--permission-preview {
-  white-space: nowrap;
-  overflow: hidden;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	-ms-text-overflow: ellipsis;
+	text-overflow: ellipsis;
 }
+
 .user-share--permission-preview li {
-  display: inline;
-  font-size: 12px;
+	display: inline;
+	font-size: 12px;
 }
+
 .user-share--permission-preview li:first-child:before {
-  content: '(';
+	content: '(';
 }
+
 .user-share--permission-preview li:not(:last-child):after {
-  content: ',';
+	content: ',';
 }
+
 .user-share--permission-preview li:last-child:after {
-  content: ')';
+	content: ')';
 }
+
 .user-share--permission-list li {
-  display: inline;
+	display: inline;
 }
+
 .user-share--toggle-dropdown {
-  cursor: pointer;
+	cursor: pointer;
 }
+
 /* ---------------------------------------------------- PUBLIC LINK MODAL --- */
 
 .public-link-modal--item {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
-.public-link-modal--label,
-.public-link-modal--input {
-  display: block;
-  width: calc(100% - 15px) !important;
+
+.public-link-modal--label, .public-link-modal--input {
+	display: block;
+	width: calc(100% - 15px) !important;
 }
+
+.public-link-modal--input[type="password"],
+.public-link-modal--input.datepicker {
+	max-width: 50%;
+	min-width: 175px;
+}
+
 .minify {
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
-  opacity: 0;
+	width: 1px;
+	height: 1px;
+	overflow: hidden;
+	opacity: 0;
 }
+
 .minify input {
-  font-size: 1px;
+	font-size: 1px;
 }
diff --git a/core/ajax/share.php b/core/ajax/share.php
index b961bba7114e..8b70c8479da0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -142,7 +142,7 @@ function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 			} else {
 				OCP\JSON::error([
 					'data' => [
-						'message' => $l->t("Couldn't send mail to following users: %s ",
+						'message' => $l->t("Couldn't send mail to following recipient(s): %s ",
 								implode(', ', $result)
 								)
 					]
@@ -221,7 +221,7 @@ function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 				$l = \OC::$server->getL10N('core');
 				OCP\JSON::error([
 					'data' => [
-						'message' => $l->t("Couldn't send mail to following users: %s ",
+						'message' => $l->t("Couldn't send mail to following recipient(s): %s ",
 								implode(', ', $result)
 							)
 					]
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index f10d22a49c05..b76110dc6bdd 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -113,7 +113,7 @@
 				cid: this.cid,
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
-				expirationDatePlaceholder: t('core', 'Expiration date'),
+				expirationDatePlaceholder: t('core', 'Choose an expiration date'),
 				defaultExpireMessage: defaultExpireMessage,
 				isExpirationSet: isExpirationSet,
 				isExpirationEnforced: isExpirationEnforced,
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 6828eb377901..5c0c5b7a4f18 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -14,7 +14,7 @@
 	}
 
 	var PASSWORD_PLACEHOLDER_STARS = '**********';
-	var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link');
+	var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password');
 	var TEMPLATE =
 		'<div class="error-message-global hidden"></div>' +
 		'<div class="public-link-modal">'+
@@ -181,11 +181,8 @@
 				success: function() {
 					if (self.mailView) {
 						// also send out email first
-						self.mailView.sendEmails().then(done).fail(function() {
-							done();
-							// re-show the popup
-							self.show();
-						});
+						// do not resolve on errors
+						self.mailView.sendEmails().then(done);
 					} else {
 						done();
 					}
@@ -231,7 +228,7 @@
 
 				publicUploadPossible       : this._isPublicUploadPossible(),
 
-				publicUploadLabel          : t('core', 'Upload only (File Drop)'),
+				publicUploadLabel          : t('core', 'Upload only') + ' (File Drop)',
 				publicUploadDescription    : t('core', 'Receive files from others without revealing the contents of the folder.'),
 				publicUploadValue          : OC.PERMISSION_CREATE,
 				publicUploadSelected       : this.model.get('permissions') === OC.PERMISSION_CREATE,
@@ -314,18 +311,27 @@
 			var self = this;
 			var title = t('files_sharing', 'Edit link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
 			var buttons = [{
-				text: t('core', 'Save'),
-				click: _.bind(this._onClickSave, this),
-				defaultButton: true
-			}, {
 				text: t('core', 'Cancel'),
 				click: _.bind(this._onClickCancel, this)
 			}];
 
 			if (this.model.isNew()) {
 				title = t('files_sharing', 'Create link share: {name}', {name: this.itemModel.getFileInfo().getFullPath()});
+				buttons.unshift({
+					text: t('core', 'Share'),
+					click: _.bind(this._onClickSave, this),
+					defaultButton: true
+				})
 			}
-			else if (this.model.get('encryptedPassword')) {
+			else {
+				buttons.unshift({
+					text: t('core', 'Save'),
+					click: _.bind(this._onClickSave, this),
+					defaultButton: true
+				})
+			}
+
+			if (this.model.get('encryptedPassword')) {
 				buttons.push({
 					classes: 'removePassword -float-left',
 					text: t('core', 'Remove password'),
diff --git a/core/js/sharedialogmailview.js b/core/js/sharedialogmailview.js
index 35635c60e748..f467e8c38e66 100644
--- a/core/js/sharedialogmailview.js
+++ b/core/js/sharedialogmailview.js
@@ -12,14 +12,14 @@
 	if (!OC.Share) {
 		OC.Share = {};
 	}
-	
-	var TEMPLATE = 
-			'<form id="emailPrivateLink" class="emailPrivateLinkForm oneline">' +
-			'    <label for="emailPrivateLinkField-{{cid}}">{{mailLabel}}</label>' +
-			'    <input id="emailPrivateLinkField-{{cid}}" class="emailField" value="{{email}}" placeholder="{{mailPrivatePlaceholder}}" type="email" />' +
+
+	var TEMPLATE =
+			'<form id="emailPrivateLink" class="public-link-modal--item">' +
+			'    <label class="public-link-modal--label" for="emailPrivateLinkField-{{cid}}">{{mailLabel}}</label>' +
+			'    <input id="emailPrivateLinkField-{{cid}}" class="public-link-modal--input emailField" value="{{email}}" placeholder="{{mailPrivatePlaceholder}}" type="email" />' +
 			'</form>'
 		;
-	
+
 	/**
 	 * @class OCA.Share.ShareDialogMailView
 	 * @member {OC.Share.ShareItemModel} model
@@ -56,7 +56,9 @@
 			var itemSource = this.itemModel.get('itemSource');
 
 			if (!this.validateEmail(recipientEmail)) {
-				deferred.reject();
+				return deferred.reject({
+					message: t('core', '{email} is not a valid address!', {email: recipientEmail})
+				});
 			}
 
 			$.post(
@@ -71,13 +73,16 @@
 				},
 				function(result) {
 					if (!result || result.status !== 'success') {
-						OC.dialogs.alert(result.data.message, t('core', 'Error while sending notification'));
-						deferred.reject();
+						deferred.reject({
+							message: result.data.message
+						});
 					} else {
 						deferred.resolve();
 					}
-			}).fail(function() {
-				deferred.reject();
+			}).fail(function(error) {
+
+				console.log(error);
+				return deferred.reject();
 			});
 
 			return deferred.promise();
@@ -92,22 +97,25 @@
 			var $emailButton = this.$el.find('.emailButton');
 			var email = $emailField.val();
 			if (email !== '') {
-				$emailField.prop('disabled', true);
 				$emailButton.prop('disabled', true);
-				$emailField.val(t('core', 'Sending ...'));
+				$emailField
+					.prop('disabled', true)
+					.val(t('core', 'Sending ...'));
+
 				return this._sendEmailPrivateLink(email).done(function() {
-					$emailField.css('font-weight', 'bold').val(t('core','Email sent'));
-					setTimeout(function() {
-						$emailField.val('');
-						$emailField.css('font-weight', 'normal');
-						$emailField.prop('disabled', false);
-						$emailButton.prop('disabled', false);
-					}, 2000);
-				}).fail(function() {
-					$emailField.val(email);
-					$emailField.css('font-weight', 'normal');
-					$emailField.prop('disabled', false);
+					OC.dialogs.info(t('core', 'Notification was send to {email}', {email: email}), "Success");
 					$emailButton.prop('disabled', false);
+					$emailField
+						.prop('disabled', false)
+						.val('');
+
+				}).fail(function(error) {
+					OC.dialogs.info(error.message, t('core', 'An error occured'));
+					$emailButton.prop('disabled', false);
+					$emailField
+						.css('color', 'red')
+						.prop('disabled', false)
+						.val(email);
 				});
 			}
 			return $.Deferred().resolve();
@@ -115,7 +123,7 @@
 
 		render: function() {
 			var email = this.$el.find('.emailField').val();
-	
+
 			this.$el.html(this.template({
 				cid: this.cid,
 				mailPrivatePlaceholder: t('core', 'Email link to person'),
@@ -124,6 +132,12 @@
 			}));
 
 			var $emailField = this.$el.find('.emailField');
+
+			$emailField.focus(function(){
+				// remove styles attached on error
+				$(this).removeAttr('style')
+			});
+
 			if ($emailField.length !== 0) {
 				$emailField.autocomplete({
 					minLength: 1,
diff --git a/core/js/tests/specs/sharedialoglinkshareviewSpec.js b/core/js/tests/specs/sharedialoglinkshareviewSpec.js
index eed626fe3ea9..96b4ff455ae5 100644
--- a/core/js/tests/specs/sharedialoglinkshareviewSpec.js
+++ b/core/js/tests/specs/sharedialoglinkshareviewSpec.js
@@ -28,7 +28,7 @@ describe('OC.Share.ShareDialogLinkShareView', function() {
 	var view;
 
 	var PASSWORD_PLACEHOLDER_STARS = '**********';
-	var PASSWORD_PLACEHOLDER_MESSAGE = 'Choose a password for the public link';
+	var PASSWORD_PLACEHOLDER_MESSAGE = 'Choose a password';
 
 	beforeEach(function() {
 		configModel = new OC.Share.ShareConfigModel();
@@ -367,8 +367,8 @@ describe('OC.Share.ShareDialogLinkShareView', function() {
 			beforeEach(function() {
 				publicUploadConfigStub = sinon.stub(configModel, 'isPublicUploadEnabled');
 			});
-			afterEach(function() { 
-				publicUploadConfigStub.restore(); 
+			afterEach(function() {
+				publicUploadConfigStub.restore();
 			});
 
 			var dataProvider = [
diff --git a/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php b/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
index fcde44fc0ca4..b36621c3b89d 100644
--- a/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
+++ b/tests/ui/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
@@ -41,7 +41,7 @@ class EditPublicLinkPopup extends OwncloudPage {
 	private $expirationDateLabelXpath = ".//label[contains(text(), 'Expiration')]";
 	private $expirationDateInputXpath = ".//input[contains(@class,'expirationDate')]";
 	private $emailInputXpath = ".//input[@type='email']";
-	private $saveButtonXpath = ".//button[contains(text(), 'Save')]";
+	private $shareButtonXpath = ".//button[contains(text(), 'Share')]";
 	
 
 	/**
@@ -184,11 +184,11 @@ public function setLinkEmail($email) {
 	 * @return void
 	 */
 	public function save() {
-		$saveButton = $this->popupElement->find("xpath", $this->saveButtonXpath);
+		$saveButton = $this->popupElement->find("xpath", $this->shareButtonXpath);
 		if (is_null($saveButton)) {
 			throw new ElementNotFoundException(
 				__METHOD__ .
-				" xpath $this->saveButtonXpath" .
+				" xpath $this->shareButtonXpath" .
 				" could not find save button of the public link popup"
 			);
 		}