diff --git a/boot.php b/boot.php
index 239c09ee2..2bdf6a602 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1394' );
+define ( 'FRIENDICA_VERSION',      '3.0.1395' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1151      );
 
diff --git a/util/messages.po b/util/messages.po
index ab7465edd..c4a47cc25 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1394\n"
+"Project-Id-Version: 3.0.1395\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-04 10:00-0700\n"
+"POT-Creation-Date: 2012-07-05 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,13 +127,14 @@ msgstr ""
 #: ../../mod/photos.php:1309 ../../mod/photos.php:1349
 #: ../../mod/photos.php:1389 ../../mod/photos.php:1420
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
-#: ../../mod/settings.php:555 ../../mod/settings.php:709
-#: ../../mod/settings.php:770 ../../mod/settings.php:971
-#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:412
-#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:569
-#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
+#: ../../mod/localtime.php:45 ../../mod/content.php:691
+#: ../../mod/contacts.php:343 ../../mod/settings.php:555
+#: ../../mod/settings.php:709 ../../mod/settings.php:770
+#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:216
+#: ../../mod/message.php:412 ../../mod/admin.php:420 ../../mod/admin.php:656
+#: ../../mod/admin.php:792 ../../mod/admin.php:991 ../../mod/admin.php:1078
+#: ../../mod/profiles.php:569 ../../mod/invite.php:119
+#: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
@@ -283,7 +284,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:429 ../../mod/directory.php:132
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:357
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:377
 #: ../../boot.php:1154
 msgid "Location:"
 msgstr ""
@@ -518,7 +519,8 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1192 ../../include/conversation.php:490
+#: ../../mod/photos.php:1192 ../../mod/content.php:601
+#: ../../include/conversation.php:490
 msgid "Private Message"
 msgstr ""
 
@@ -558,11 +560,13 @@ msgstr ""
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1327 ../../include/conversation.php:554
+#: ../../mod/photos.php:1327 ../../mod/content.php:665
+#: ../../include/conversation.php:554
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1328 ../../include/conversation.php:555
+#: ../../mod/photos.php:1328 ../../mod/content.php:666
+#: ../../include/conversation.php:555
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -571,6 +575,7 @@ msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1330 ../../mod/editpost.php:104
+#: ../../mod/content.php:482 ../../mod/content.php:842
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215
 #: ../../mod/message.php:413 ../../include/conversation.php:371
 #: ../../include/conversation.php:731 ../../include/conversation.php:1012
@@ -578,22 +583,25 @@ msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1346 ../../mod/photos.php:1386
-#: ../../mod/photos.php:1417 ../../include/conversation.php:577
+#: ../../mod/photos.php:1417 ../../mod/content.php:688
+#: ../../include/conversation.php:577
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1348 ../../mod/photos.php:1388
-#: ../../mod/photos.php:1419 ../../include/conversation.php:579
-#: ../../boot.php:546
+#: ../../mod/photos.php:1419 ../../mod/content.php:690
+#: ../../include/conversation.php:579 ../../boot.php:546
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1350 ../../mod/editpost.php:125
-#: ../../include/conversation.php:589 ../../include/conversation.php:1030
+#: ../../mod/content.php:700 ../../include/conversation.php:589
+#: ../../include/conversation.php:1030
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1447 ../../mod/settings.php:618
+#: ../../mod/photos.php:1447 ../../mod/content.php:439
+#: ../../mod/content.php:720 ../../mod/settings.php:618
 #: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:663
 #: ../../include/conversation.php:328 ../../include/conversation.php:609
 msgid "Delete"
@@ -664,8 +672,8 @@ msgstr ""
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:617
-#: ../../include/conversation.php:596
+#: ../../mod/editpost.php:95 ../../mod/content.php:707
+#: ../../mod/settings.php:617 ../../include/conversation.php:596
 msgid "Edit"
 msgstr ""
 
@@ -1172,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:335
+#: ../../include/bb2diaspora.php:355
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1234,6 +1242,138 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
+#: ../../mod/content.php:119 ../../mod/network.php:436
+msgid "No such group"
+msgstr ""
+
+#: ../../mod/content.php:130 ../../mod/network.php:447
+msgid "Group is empty"
+msgstr ""
+
+#: ../../mod/content.php:134 ../../mod/network.php:451
+msgid "Group: "
+msgstr ""
+
+#: ../../mod/content.php:438 ../../mod/content.php:719
+#: ../../include/conversation.php:327 ../../include/conversation.php:608
+msgid "Select"
+msgstr ""
+
+#: ../../mod/content.php:455 ../../mod/content.php:812
+#: ../../mod/content.php:813 ../../include/conversation.php:344
+#: ../../include/conversation.php:701 ../../include/conversation.php:702
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../mod/content.php:465 ../../mod/content.php:824
+#: ../../include/conversation.php:354 ../../include/conversation.php:713
+#, php-format
+msgid "%s from %s"
+msgstr ""
+
+#: ../../mod/content.php:480 ../../include/conversation.php:369
+msgid "View in context"
+msgstr ""
+
+#: ../../mod/content.php:586 ../../include/conversation.php:475
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/content.php:587 ../../addon/page/page.php:76
+#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
+#: ../../boot.php:547
+msgid "show more"
+msgstr ""
+
+#: ../../mod/content.php:665 ../../include/conversation.php:554
+msgid "like"
+msgstr ""
+
+#: ../../mod/content.php:666 ../../include/conversation.php:555
+msgid "dislike"
+msgstr ""
+
+#: ../../mod/content.php:668 ../../include/conversation.php:557
+msgid "Share this"
+msgstr ""
+
+#: ../../mod/content.php:668 ../../include/conversation.php:557
+msgid "share"
+msgstr ""
+
+#: ../../mod/content.php:692 ../../include/conversation.php:581
+msgid "Bold"
+msgstr ""
+
+#: ../../mod/content.php:693 ../../include/conversation.php:582
+msgid "Italic"
+msgstr ""
+
+#: ../../mod/content.php:694 ../../include/conversation.php:583
+msgid "Underline"
+msgstr ""
+
+#: ../../mod/content.php:695 ../../include/conversation.php:584
+msgid "Quote"
+msgstr ""
+
+#: ../../mod/content.php:696 ../../include/conversation.php:585
+msgid "Code"
+msgstr ""
+
+#: ../../mod/content.php:697 ../../include/conversation.php:586
+msgid "Image"
+msgstr ""
+
+#: ../../mod/content.php:698 ../../include/conversation.php:587
+msgid "Link"
+msgstr ""
+
+#: ../../mod/content.php:699 ../../include/conversation.php:588
+msgid "Video"
+msgstr ""
+
+#: ../../mod/content.php:732 ../../include/conversation.php:621
+msgid "add star"
+msgstr ""
+
+#: ../../mod/content.php:733 ../../include/conversation.php:622
+msgid "remove star"
+msgstr ""
+
+#: ../../mod/content.php:734 ../../include/conversation.php:623
+msgid "toggle star status"
+msgstr ""
+
+#: ../../mod/content.php:737 ../../include/conversation.php:626
+msgid "starred"
+msgstr ""
+
+#: ../../mod/content.php:738 ../../include/conversation.php:627
+msgid "add tag"
+msgstr ""
+
+#: ../../mod/content.php:742 ../../include/conversation.php:631
+msgid "save to folder"
+msgstr ""
+
+#: ../../mod/content.php:814 ../../include/conversation.php:703
+msgid "to"
+msgstr ""
+
+#: ../../mod/content.php:815 ../../include/conversation.php:704
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../mod/content.php:816 ../../include/conversation.php:705
+msgid "via Wall-To-Wall:"
+msgstr ""
+
 #: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -2410,18 +2550,6 @@ msgstr[1] ""
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:436
-msgid "No such group"
-msgstr ""
-
-#: ../../mod/network.php:447
-msgid "Group is empty"
-msgstr ""
-
-#: ../../mod/network.php:451
-msgid "Group: "
-msgstr ""
-
 #: ../../mod/network.php:461
 msgid "Contact: "
 msgstr ""
@@ -3722,7 +3850,7 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:28 ../../include/bb2diaspora.php:200
 msgid "link"
 msgstr ""
 
@@ -4731,12 +4859,6 @@ msgstr ""
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:76 ../../addon/page/page.php:110
-#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
-#: ../../include/conversation.php:476 ../../boot.php:547
-msgid "show more"
-msgstr ""
-
 #: ../../addon/page/page.php:129
 msgid "Forums:"
 msgstr ""
@@ -6556,11 +6678,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:341
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:361
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:349
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:369
 msgid "Finishes:"
 msgstr ""
 
@@ -7308,6 +7430,11 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
+#: ../../include/bb2diaspora.php:200 ../../include/bb2diaspora.php:210
+#: ../../include/bb2diaspora.php:211
+msgid "image/photo"
+msgstr ""
+
 #: ../../include/user.php:38
 msgid "An invitation is required."
 msgstr ""
@@ -7434,116 +7561,6 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:327 ../../include/conversation.php:608
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:344 ../../include/conversation.php:701
-#: ../../include/conversation.php:702
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:354 ../../include/conversation.php:713
-#, php-format
-msgid "%s from %s"
-msgstr ""
-
-#: ../../include/conversation.php:369
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:475
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:554
-msgid "like"
-msgstr ""
-
-#: ../../include/conversation.php:555
-msgid "dislike"
-msgstr ""
-
-#: ../../include/conversation.php:557
-msgid "Share this"
-msgstr ""
-
-#: ../../include/conversation.php:557
-msgid "share"
-msgstr ""
-
-#: ../../include/conversation.php:581
-msgid "Bold"
-msgstr ""
-
-#: ../../include/conversation.php:582
-msgid "Italic"
-msgstr ""
-
-#: ../../include/conversation.php:583
-msgid "Underline"
-msgstr ""
-
-#: ../../include/conversation.php:584
-msgid "Quote"
-msgstr ""
-
-#: ../../include/conversation.php:585
-msgid "Code"
-msgstr ""
-
-#: ../../include/conversation.php:586
-msgid "Image"
-msgstr ""
-
-#: ../../include/conversation.php:587
-msgid "Link"
-msgstr ""
-
-#: ../../include/conversation.php:588
-msgid "Video"
-msgstr ""
-
-#: ../../include/conversation.php:621
-msgid "add star"
-msgstr ""
-
-#: ../../include/conversation.php:622
-msgid "remove star"
-msgstr ""
-
-#: ../../include/conversation.php:623
-msgid "toggle star status"
-msgstr ""
-
-#: ../../include/conversation.php:626
-msgid "starred"
-msgstr ""
-
-#: ../../include/conversation.php:627
-msgid "add tag"
-msgstr ""
-
-#: ../../include/conversation.php:631
-msgid "save to folder"
-msgstr ""
-
-#: ../../include/conversation.php:703
-msgid "to"
-msgstr ""
-
-#: ../../include/conversation.php:704
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../include/conversation.php:705
-msgid "via Wall-To-Wall:"
-msgstr ""
-
 #: ../../include/conversation.php:750
 msgid "Delete Selected Items"
 msgstr ""