diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 60b290850a..2f1181a856 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -103,7 +103,8 @@ function fbrowser_content(App $a)
 				return [
 					DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
 					$filename_e,
-					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext,
+					$rr['desc']
 				];
 			}
 			$files = array_map("_map_files1", $r);
diff --git a/view/js/filebrowser.js b/view/js/filebrowser.js
index d35e4866fa..24b4d904fd 100644
--- a/view/js/filebrowser.js
+++ b/view/js/filebrowser.js
@@ -85,7 +85,7 @@ var FileBrowser = {
 
 			var embed = "";
 			if (FileBrowser.type == "image") {
-				embed = "[url="+this.dataset.link+"][img="+this.dataset.img+"][/img][/url]";
+				embed = "[url="+this.dataset.link+"][img="+this.dataset.img+"]"+this.dataset.alt+"[/img][/url]";
 			}
 			if (FileBrowser.type=="file") {
 				// attachment links are "baseurl/attach/id"; we need id
diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
index 7afcad3903..8082355d1d 100644
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@@ -32,7 +32,7 @@
 	<div class="list">
 		{{foreach $files as $f}}
 		<div class="photo-album-image-wrapper">
-			<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+			<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}" data-alt="{{$f.3}}>
 				<img src="{{$f.2}}">
 				<p>{{$f.1}}</p>
 			</a>
diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index bebb279078..359c6636eb 100644
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -116,7 +116,7 @@ var FileBrowser = {
 
 			var embed = "";
 			if (FileBrowser.type === "image") {
-				embed = "[url=" + this.dataset.link + "][img=" + this.dataset.img + "][/img][/url]";
+				embed = "[url=" + this.dataset.link + "][img=" + this.dataset.img + "]" + this.dataset.alt + "[/img][/url]";
 			}
 			if (FileBrowser.type === "file") {
 				// attachment links are "baseurl/attach/id"; we need id
diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index e8c03cf386..13c4790487 100644
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -42,7 +42,7 @@
 				<div class="fbrowser-content-container">
 					{{foreach $files as $f}}
 					<div class="photo-album-image-wrapper">
-						<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+						<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}" data-alt="{{$f.3}}">
 							<img src="{{$f.2}}" alt="{{$f.1}}">
 							<p>{{$f.1}}</p>
 						</a>