diff --git a/boot.php b/boot.php
index 3064b817d2..5097398aa4 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1601' );
+define ( 'FRIENDICA_VERSION',      '3.1.1603' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1159      );
 
diff --git a/util/messages.po b/util/messages.po
index fcd63b12a9..0d551542d7 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1601\n"
+"Project-Id-Version: 3.1.1603\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-27 10:00-0800\n"
+"POT-Creation-Date: 2013-01-29 10:00-0800\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"
@@ -37,11 +37,11 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:1041
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
 #: ../../mod/settings.php:91 ../../mod/settings.php:542
-#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:547 ../../mod/manage.php:96 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -50,17 +50,17 @@ msgstr ""
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/message.php:38 ../../mod/message.php:172
+#: ../../mod/message.php:38 ../../mod/message.php:174
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:180 ../../mod/profiles.php:146
+#: ../../mod/display.php:181 ../../mod/profiles.php:146
 #: ../../mod/profiles.php:567 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:101
+#: ../../mod/suggest.php:56 ../../mod/invite.php:15 ../../mod/invite.php:101
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
 #: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
 #: ../../addon/fbpost/fbpost.php:176
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:4015
 #: ../../index.php:341 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -131,19 +131,20 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:466 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
-#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
-#: ../../mod/photos.php:1569 ../../mod/install.php:248
+#: ../../mod/events.php:476 ../../mod/photos.php:1075
+#: ../../mod/photos.php:1196 ../../mod/photos.php:1498
+#: ../../mod/photos.php:1549 ../../mod/photos.php:1593
+#: ../../mod/photos.php:1676 ../../mod/install.php:248
 #: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/content.php:710 ../../mod/contacts.php:386
 #: ../../mod/settings.php:560 ../../mod/settings.php:670
 #: ../../mod/settings.php:739 ../../mod/settings.php:811
-#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
-#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
-#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1151 ../../mod/profiles.php:626
-#: ../../mod/invite.php:140 ../../addon/fromgplus/fromgplus.php:44
+#: ../../mod/settings.php:1037 ../../mod/manage.php:110 ../../mod/group.php:87
+#: ../../mod/mood.php:137 ../../mod/message.php:335 ../../mod/message.php:564
+#: ../../mod/admin.php:461 ../../mod/admin.php:728 ../../mod/admin.php:865
+#: ../../mod/admin.php:1064 ../../mod/admin.php:1151
+#: ../../mod/profiles.php:626 ../../mod/invite.php:140
+#: ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
@@ -238,7 +239,7 @@ msgid "Help:"
 msgstr ""
 
 #: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../include/nav.php:113 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr ""
 
@@ -276,87 +277,87 @@ msgstr ""
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:279
+#: ../../mod/events.php:289
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:301
+#: ../../mod/events.php:311
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:323 ../../include/text.php:1246
+#: ../../mod/events.php:333 ../../include/text.php:1246
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1857
+#: ../../mod/events.php:368 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:79 ../../boot.php:1857
 msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:359
+#: ../../mod/events.php:369
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:370 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:361 ../../mod/install.php:207
+#: ../../mod/events.php:371 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:444
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:454
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:445
+#: ../../mod/events.php:455
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:447
+#: ../../mod/events.php:457
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:447 ../../mod/events.php:461
+#: ../../mod/events.php:457 ../../mod/events.php:471
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:460
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:462
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:465
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:457
+#: ../../mod/events.php:467
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:459 ../../mod/directory.php:134
+#: ../../mod/events.php:469 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
 #: ../../boot.php:1379
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:471
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:473
 msgid "Share this event"
 msgstr ""
 
@@ -364,11 +365,14 @@ msgstr ""
 msgid "System down for maintenance"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1042
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/photos.php:202
+#: ../../mod/photos.php:289 ../../mod/editpost.php:148
+#: ../../mod/dfrn_request.php:848 ../../mod/contacts.php:249
+#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
+#: ../../mod/message.php:212 ../../mod/suggest.php:32
+#: ../../addon/js_upload/js_upload.php:45 ../../include/items.php:3897
+#: ../../include/conversation.php:1062
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -415,14 +419,16 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:934 ../../mod/settings.php:940
-#: ../../mod/settings.php:948 ../../mod/settings.php:952
-#: ../../mod/settings.php:957 ../../mod/settings.php:963
-#: ../../mod/settings.php:969 ../../mod/settings.php:975
-#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
-#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
-#: ../../mod/settings.php:1009 ../../mod/register.php:239
-#: ../../mod/profiles.php:606
+#: ../../mod/contacts.php:246 ../../mod/settings.php:934
+#: ../../mod/settings.php:940 ../../mod/settings.php:948
+#: ../../mod/settings.php:952 ../../mod/settings.php:957
+#: ../../mod/settings.php:963 ../../mod/settings.php:969
+#: ../../mod/settings.php:975 ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008 ../../mod/settings.php:1009
+#: ../../mod/register.php:239 ../../mod/message.php:209
+#: ../../mod/profiles.php:606 ../../mod/suggest.php:29
+#: ../../include/items.php:3894
 msgid "Yes"
 msgstr ""
 
@@ -442,16 +448,16 @@ msgstr ""
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
-#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1055
+#: ../../mod/photos.php:1180 ../../mod/photos.php:1203
+#: ../../mod/photos.php:1733 ../../mod/photos.php:1745
 #: ../../addon/communityhome/communityhome.php:115
 #: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
+#: ../../mod/photos.php:66 ../../mod/photos.php:1219 ../../mod/photos.php:1792
 msgid "Upload New Photos"
 msgstr ""
 
@@ -463,8 +469,8 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
-#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:722 ../../mod/photos.php:1180
+#: ../../mod/photos.php:1203 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
@@ -479,212 +485,246 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1119
+#: ../../mod/photos.php:187 ../../mod/photos.php:199 ../../mod/photos.php:1197
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1403
+#: ../../mod/photos.php:197
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr ""
+
+#: ../../mod/photos.php:275 ../../mod/photos.php:286 ../../mod/photos.php:1499
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:607
+#: ../../mod/photos.php:284
+msgid "Do you really want to delete this photo?"
+msgstr ""
+
+#: ../../mod/photos.php:653
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/photos.php:607
+#: ../../mod/photos.php:653
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
+#: ../../mod/photos.php:758 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:720
+#: ../../mod/photos.php:766
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/photos.php:798 ../../mod/profile_photo.php:153
 #: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/photos.php:825 ../../mod/profile_photo.php:301
 #: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:865 ../../mod/community.php:18
+#: ../../mod/photos.php:911 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:875
+#: ../../mod/photos.php:921
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:976
+#: ../../mod/photos.php:1022
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1037
+#: ../../mod/photos.php:1085
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1120
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
+#: ../../mod/photos.php:1124 ../../mod/photos.php:1192
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1058
+#: ../../mod/photos.php:1125
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1059
+#: ../../mod/photos.php:1126
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
+#: ../../mod/photos.php:1128 ../../mod/photos.php:1494
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1129
-msgid "Edit Album"
+#: ../../mod/photos.php:1137 ../../mod/photos.php:1503
+#: ../../mod/settings.php:1070
+msgid "Show to Groups"
 msgstr ""
 
-#: ../../mod/photos.php:1135
-msgid "Show Newest First"
+#: ../../mod/photos.php:1138 ../../mod/photos.php:1504
+#: ../../mod/settings.php:1071
+msgid "Show to Contacts"
 msgstr ""
 
-#: ../../mod/photos.php:1137
-msgid "Show Oldest First"
+#: ../../mod/photos.php:1139
+msgid "Private Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1205
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/photos.php:1140
+msgid "Public Photo"
 msgstr ""
 
 #: ../../mod/photos.php:1207
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:1213
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:1215
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:1248 ../../mod/photos.php:1775
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1283
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:1285
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1263
+#: ../../mod/photos.php:1341
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1263
+#: ../../mod/photos.php:1341
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1264
+#: ../../mod/photos.php:1342
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1270 ../../mod/content.php:620
+#: ../../mod/photos.php:1348 ../../mod/content.php:620
 #: ../../object/Item.php:106
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1289
+#: ../../mod/photos.php:1367
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1363
+#: ../../mod/photos.php:1441
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1366
+#: ../../mod/photos.php:1444
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1388
+#: ../../mod/photos.php:1484
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1389
+#: ../../mod/photos.php:1485
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1391
+#: ../../mod/photos.php:1487
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1394
+#: ../../mod/photos.php:1490
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1396
+#: ../../mod/photos.php:1492
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1400
+#: ../../mod/photos.php:1496
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1420 ../../mod/content.php:684
+#: ../../mod/photos.php:1505
+msgid "Private photo"
+msgstr ""
+
+#: ../../mod/photos.php:1506
+msgid "Public photo"
+msgstr ""
+
+#: ../../mod/photos.php:1526 ../../mod/content.php:684
 #: ../../object/Item.php:204
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1421 ../../mod/content.php:685
+#: ../../mod/photos.php:1527 ../../mod/content.php:685
 #: ../../object/Item.php:205
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1422 ../../include/conversation.php:1002
+#: ../../mod/photos.php:1528 ../../include/conversation.php:1023
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/photos.php:1529 ../../mod/editpost.php:124
 #: ../../mod/content.php:499 ../../mod/content.php:883
-#: ../../mod/wallmessage.php:152 ../../mod/message.php:300
-#: ../../mod/message.php:528 ../../include/conversation.php:645
-#: ../../include/conversation.php:1021 ../../object/Item.php:293
+#: ../../mod/wallmessage.php:156 ../../mod/message.php:334
+#: ../../mod/message.php:565 ../../include/conversation.php:646
+#: ../../include/conversation.php:1042 ../../object/Item.php:293
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
-#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../mod/photos.php:1546 ../../mod/photos.php:1590
+#: ../../mod/photos.php:1673 ../../mod/content.php:707
 #: ../../object/Item.php:601
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
-#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
+#: ../../mod/photos.php:1548 ../../mod/photos.php:1592
+#: ../../mod/photos.php:1675 ../../mod/content.php:709 ../../boot.php:641
 #: ../../object/Item.php:290 ../../object/Item.php:603
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
-#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
-#: ../../mod/content.php:719 ../../include/conversation.php:1039
+#: ../../mod/photos.php:1550 ../../mod/photos.php:1594
+#: ../../mod/photos.php:1677 ../../mod/editpost.php:145
+#: ../../mod/content.php:719 ../../include/conversation.php:1059
 #: ../../object/Item.php:613
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/photos.php:1634 ../../mod/content.php:439
 #: ../../mod/content.php:741 ../../mod/settings.php:623
 #: ../../mod/group.php:171 ../../mod/admin.php:735
-#: ../../include/conversation.php:569 ../../object/Item.php:120
+#: ../../include/conversation.php:570 ../../object/Item.php:120
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1674
+#: ../../mod/photos.php:1781
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1683
+#: ../../mod/photos.php:1790
 msgid "Recent Photos"
 msgstr ""
 
@@ -693,7 +733,7 @@ msgid "Not available."
 msgstr ""
 
 #: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
-#: ../../include/nav.php:101
+#: ../../include/nav.php:128
 msgid "Community"
 msgstr ""
 
@@ -742,96 +782,92 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:988
-msgid "Post to Email"
-msgstr ""
-
-#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/editpost.php:109 ../../mod/content.php:728
 #: ../../mod/settings.php:622 ../../object/Item.php:110
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:525
-#: ../../include/conversation.php:1003
+#: ../../mod/editpost.php:110 ../../mod/wallmessage.php:154
+#: ../../mod/message.php:332 ../../mod/message.php:562
+#: ../../include/conversation.php:1024
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:1004
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1025
 msgid "upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:1005
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1026
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1006
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1027
 msgid "attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:526
-#: ../../include/conversation.php:1007
+#: ../../mod/editpost.php:114 ../../mod/wallmessage.php:155
+#: ../../mod/message.php:333 ../../mod/message.php:563
+#: ../../include/conversation.php:1028
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1008
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1029
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1009
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1030
 msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1010
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1031
 msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1011
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1032
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1012
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1033
 msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1013
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1034
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1014
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1035
 msgid "set location"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1015
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1036
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1016
+#: ../../mod/editpost.php:123 ../../include/conversation.php:1037
 msgid "clear location"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1022
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1043
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:1031
+#: ../../mod/editpost.php:133 ../../include/conversation.php:1052
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:1032
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1053
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1018
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1039
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:1020
+#: ../../mod/editpost.php:139 ../../include/conversation.php:1041
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1034
+#: ../../mod/editpost.php:140 ../../include/conversation.php:1055
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1024,7 +1060,7 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:167
 msgid "Account settings"
 msgstr ""
 
@@ -1056,7 +1092,7 @@ msgstr ""
 #: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:167
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1431,7 +1467,7 @@ msgstr ""
 msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../mod/match.php:58 ../../mod/suggest.php:88
 #: ../../include/contact_widgets.php:9 ../../boot.php:1317
 msgid "Connect"
 msgstr ""
@@ -1449,37 +1485,37 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/content.php:119 ../../mod/network.php:594
+#: ../../mod/content.php:119 ../../mod/network.php:596
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/content.php:130 ../../mod/network.php:605
+#: ../../mod/content.php:130 ../../mod/network.php:607
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/content.php:134 ../../mod/network.php:609
+#: ../../mod/content.php:134 ../../mod/network.php:611
 msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:740
-#: ../../include/conversation.php:568 ../../object/Item.php:119
+#: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:472 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../mod/content.php:853 ../../include/conversation.php:609
 #: ../../object/Item.php:258 ../../object/Item.php:259
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:482 ../../mod/content.php:864
-#: ../../include/conversation.php:628 ../../object/Item.php:272
+#: ../../include/conversation.php:629 ../../object/Item.php:272
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:497 ../../include/conversation.php:643
+#: ../../mod/content.php:497 ../../include/conversation.php:644
 msgid "View in context"
 msgstr ""
 
@@ -1605,8 +1641,8 @@ msgid "Discard"
 msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
-#: ../../mod/contacts.php:379
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:359
+#: ../../mod/contacts.php:413
 msgid "Ignore"
 msgstr ""
 
@@ -1614,7 +1650,7 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:83 ../../include/nav.php:113
+#: ../../mod/notifications.php:83 ../../include/nav.php:140
 msgid "Network"
 msgstr ""
 
@@ -1623,16 +1659,16 @@ msgid "Personal"
 msgstr ""
 
 #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
-#: ../../include/nav.php:77 ../../include/nav.php:116
+#: ../../include/nav.php:104 ../../include/nav.php:143
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:122
+#: ../../mod/notifications.php:98 ../../include/nav.php:149
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:103 ../../mod/message.php:180
-#: ../../include/nav.php:129
+#: ../../mod/notifications.php:103 ../../mod/message.php:182
+#: ../../include/nav.php:156
 msgid "Messages"
 msgstr ""
 
@@ -1658,7 +1694,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/contacts.php:385
+#: ../../mod/contacts.php:419
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1715,7 +1751,7 @@ msgstr ""
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:220 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:150
 msgid "Notifications"
 msgstr ""
 
@@ -1816,272 +1852,276 @@ msgstr ""
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:233
+#: ../../mod/contacts.php:244
+msgid "Do you really want to delete this contact?"
+msgstr ""
+
+#: ../../mod/contacts.php:263
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:301
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:305
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:310
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:327
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:330
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:300
+#: ../../mod/contacts.php:334
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:300
+#: ../../mod/contacts.php:334
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:336
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:340
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
+#: ../../mod/contacts.php:343 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:314
+#: ../../mod/contacts.php:348
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
 #: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
 #: ../../mod/admin.php:736
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:356
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
+#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:362
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:366
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:366
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:369
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:372
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:375
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:347
+#: ../../mod/contacts.php:381
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:384
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:387
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:388
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:389
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:390
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
+#: ../../mod/contacts.php:395 ../../mod/contacts.php:585
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:396
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:397
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:398
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:365
+#: ../../mod/contacts.php:399
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:401
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:371
+#: ../../mod/contacts.php:405
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:407
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
+#: ../../mod/contacts.php:409 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:382
+#: ../../mod/contacts.php:416
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:383
+#: ../../mod/contacts.php:417
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:418
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:385
+#: ../../mod/contacts.php:419
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:438
+#: ../../mod/contacts.php:470
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:441
+#: ../../mod/contacts.php:473
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:194
+#: ../../mod/contacts.php:476 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:447
+#: ../../mod/contacts.php:479
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:450
+#: ../../mod/contacts.php:482
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:485
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:457
+#: ../../mod/contacts.php:489
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:492
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:464
+#: ../../mod/contacts.php:496
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:499
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:471
+#: ../../mod/contacts.php:503
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:506
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:478
+#: ../../mod/contacts.php:510
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:513
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:561
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:565
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:537
+#: ../../mod/contacts.php:569
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:586 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:144
+#: ../../mod/contacts.php:607 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:171
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:579
+#: ../../mod/contacts.php:611
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../mod/contacts.php:612 ../../mod/directory.php:59
 #: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../mod/contacts.php:613 ../../mod/directory.php:61
 #: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
@@ -2555,149 +2595,161 @@ msgstr ""
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1035
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1043
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1044
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1045
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1045
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1049
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1050 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1051
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1052
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1053
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1054
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1057
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1059
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
+#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1060
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1061
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1059
-msgid "Maximum private messages per day from unknown people:"
-msgstr ""
-
-#: ../../mod/settings.php:1062
-msgid "Notification Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1063
-msgid "By default post a status message when:"
-msgstr ""
-
-#: ../../mod/settings.php:1064
-msgid "accepting a friend request"
-msgstr ""
-
-#: ../../mod/settings.php:1065
-msgid "joining a forum/community"
-msgstr ""
-
-#: ../../mod/settings.php:1066
-msgid "making an <em>interesting</em> profile change"
-msgstr ""
-
-#: ../../mod/settings.php:1067
-msgid "Send a notification email when:"
-msgstr ""
-
-#: ../../mod/settings.php:1068
-msgid "You receive an introduction"
-msgstr ""
-
-#: ../../mod/settings.php:1069
-msgid "Your introductions are confirmed"
-msgstr ""
-
-#: ../../mod/settings.php:1070
-msgid "Someone writes on your profile wall"
-msgstr ""
-
-#: ../../mod/settings.php:1071
-msgid "Someone writes a followup comment"
-msgstr ""
-
 #: ../../mod/settings.php:1072
-msgid "You receive a private message"
+msgid "Default Private Post"
 msgstr ""
 
 #: ../../mod/settings.php:1073
+msgid "Default Public Post"
+msgstr ""
+
+#: ../../mod/settings.php:1077
+msgid "Default Permissions for New Posts"
+msgstr ""
+
+#: ../../mod/settings.php:1089
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:1092
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1093
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:1094
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:1095
+msgid "joining a forum/community"
+msgstr ""
+
+#: ../../mod/settings.php:1096
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:1097
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:1098
+msgid "You receive an introduction"
+msgstr ""
+
+#: ../../mod/settings.php:1099
+msgid "Your introductions are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:1100
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:1101
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:1102
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:1103
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1104
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1105
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1108
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1109
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/manage.php:94
+#: ../../mod/manage.php:106
 msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/manage.php:97
+#: ../../mod/manage.php:107
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/manage.php:99
+#: ../../mod/manage.php:108
 msgid "Select an identity to manage: "
 msgstr ""
 
@@ -2774,15 +2826,15 @@ msgstr[1] ""
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:619
+#: ../../mod/network.php:621
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:621
+#: ../../mod/network.php:623
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:626
+#: ../../mod/network.php:628
 msgid "Invalid contact."
 msgstr ""
 
@@ -2874,36 +2926,36 @@ msgstr ""
 msgid "No recipient."
 msgstr ""
 
-#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../mod/message.php:429 ../../mod/message.php:437
-#: ../../include/conversation.php:938 ../../include/conversation.php:956
+#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
+#: ../../mod/message.php:283 ../../mod/message.php:291
+#: ../../mod/message.php:466 ../../mod/message.php:474
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
+#: ../../mod/wallmessage.php:142 ../../mod/message.php:319
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/wallmessage.php:139
+#: ../../mod/wallmessage.php:143
 #, php-format
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:516
+#: ../../mod/wallmessage.php:144 ../../mod/message.php:320
+#: ../../mod/message.php:553
 msgid "To:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:518
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:325
+#: ../../mod/message.php:555
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:521 ../../mod/invite.php:134
+#: ../../mod/wallmessage.php:151 ../../mod/message.php:329
+#: ../../mod/message.php:558 ../../mod/invite.php:134
 msgid "Your message:"
 msgstr ""
 
@@ -2959,7 +3011,7 @@ msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
+#: ../../include/profile_advanced.php:84 ../../include/nav.php:77
 #: ../../boot.php:1840
 msgid "Profile"
 msgstr ""
@@ -3265,7 +3317,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:1012
+#: ../../mod/register.php:275 ../../include/nav.php:108 ../../boot.php:1012
 msgid "Register"
 msgstr ""
 
@@ -3273,47 +3325,47 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
-#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
+#: ../../mod/like.php:151 ../../mod/subthread.php:87 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:171
 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
-#: ../../include/diaspora.php:1860 ../../include/conversation.php:125
-#: ../../include/conversation.php:253
+#: ../../include/diaspora.php:1860 ../../include/conversation.php:126
+#: ../../include/conversation.php:254
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr ""
 
-#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
+#: ../../mod/like.php:151 ../../mod/like.php:322 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600
 #: ../../addon/communityhome/communityhome.php:166
 #: ../../addon/communityhome/communityhome.php:175
 #: ../../view/theme/diabook/theme.php:459
 #: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1860
-#: ../../include/conversation.php:120 ../../include/conversation.php:129
-#: ../../include/conversation.php:248 ../../include/conversation.php:257
+#: ../../include/conversation.php:121 ../../include/conversation.php:130
+#: ../../include/conversation.php:249 ../../include/conversation.php:258
 #: ../../addon.old/facebook/facebook.php:1598
 #: ../../addon.old/communityhome/communityhome.php:158
 #: ../../addon.old/communityhome/communityhome.php:167
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../mod/like.php:168 ../../addon/facebook/facebook.php:1604
 #: ../../addon/communityhome/communityhome.php:180
 #: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876
-#: ../../include/conversation.php:136
+#: ../../include/conversation.php:137
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:164 ../../include/conversation.php:139
+#: ../../mod/like.php:170 ../../include/conversation.php:140
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:51
-#: ../../mod/display.php:184 ../../include/items.php:3853
+#: ../../mod/display.php:185 ../../include/items.php:3853
 msgid "Item not found."
 msgstr ""
 
@@ -3322,7 +3374,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1847
+#: ../../include/nav.php:78 ../../boot.php:1847
 msgid "Photos"
 msgstr ""
 
@@ -3347,43 +3399,43 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:288
+#: ../../mod/item.php:292
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
+#: ../../mod/item.php:428 ../../mod/wall_upload.php:135
 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:837
+#: ../../mod/item.php:841
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:862
+#: ../../mod/item.php:866
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:864
+#: ../../mod/item.php:868
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:865
+#: ../../mod/item.php:869
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:867
+#: ../../mod/item.php:871
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:226
+#: ../../mod/mood.php:62 ../../include/conversation.php:227
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""
@@ -3477,7 +3529,15 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/message.php:9 ../../include/nav.php:132
+#: ../../mod/navigation.php:20 ../../include/nav.php:34
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../mod/navigation.php:24 ../../include/nav.php:38
+msgid "Clear notifications"
+msgstr ""
+
+#: ../../mod/message.php:9 ../../include/nav.php:159
 msgid "New Message"
 msgstr ""
 
@@ -3485,63 +3545,67 @@ msgstr ""
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:195
+#: ../../mod/message.php:207
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#: ../../mod/message.php:227
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:225
+#: ../../mod/message.php:258
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:371
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:341
+#: ../../mod/message.php:378
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:344
+#: ../../mod/message.php:381
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:347
+#: ../../mod/message.php:384
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:368 ../../mod/message.php:509
+#: ../../mod/message.php:405 ../../mod/message.php:546
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:371
+#: ../../mod/message.php:408
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:374
+#: ../../mod/message.php:411
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:413
+#: ../../mod/message.php:450
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:483
+#: ../../mod/message.php:520
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:511
+#: ../../mod/message.php:548
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:515
+#: ../../mod/message.php:552
 msgid "Send Reply"
 msgstr ""
 
@@ -3582,7 +3646,7 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120 ../../include/nav.php:151
+#: ../../mod/admin.php:120 ../../include/nav.php:178
 msgid "Admin"
 msgstr ""
 
@@ -4355,7 +4419,7 @@ msgstr ""
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:177
+#: ../../mod/display.php:178
 msgid "Item has been removed."
 msgstr ""
 
@@ -4368,7 +4432,7 @@ msgid "No installed applications."
 msgstr ""
 
 #: ../../mod/search.php:99 ../../include/text.php:738
-#: ../../include/text.php:739 ../../include/nav.php:91
+#: ../../include/text.php:739 ../../include/nav.php:118
 msgid "Search"
 msgstr ""
 
@@ -4686,8 +4750,8 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:942
-#: ../../include/conversation.php:960
+#: ../../mod/filer.php:30 ../../include/conversation.php:944
+#: ../../include/conversation.php:962
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4695,7 +4759,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:265
+#: ../../mod/tagger.php:95 ../../include/conversation.php:266
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4704,7 +4768,7 @@ msgstr ""
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:121 ../../include/nav.php:138
+#: ../../mod/delegate.php:121 ../../include/nav.php:165
 msgid "Delegate Page Management"
 msgstr ""
 
@@ -4783,18 +4847,22 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: ../../mod/suggest.php:66 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
 
-#: ../../mod/suggest.php:44
+#: ../../mod/suggest.php:72
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../mod/suggest.php:61
+#: ../../mod/suggest.php:90
 msgid "Ignore/Hide"
 msgstr ""
 
@@ -4973,7 +5041,7 @@ msgid "Unable to set contact photo."
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621
-#: ../../include/conversation.php:171
+#: ../../include/conversation.php:172
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
@@ -5742,7 +5810,7 @@ msgid "Forum Directory"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:91
 #: ../../boot.php:1037 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5780,7 +5848,7 @@ msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:163
 #: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1496
-#: ../../include/conversation.php:117 ../../include/conversation.php:245
+#: ../../include/conversation.php:118 ../../include/conversation.php:246
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
 msgstr ""
@@ -7839,12 +7907,12 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
-#: ../../include/nav.php:116
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:76
+#: ../../include/nav.php:143
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:77
 msgid "Your profile page"
 msgstr ""
 
@@ -7852,19 +7920,19 @@ msgstr ""
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:78
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:79
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
 msgid "Your personal photos"
 msgstr ""
 
@@ -7960,12 +8028,12 @@ msgid "Set twitter search term"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:327
 msgid "don't show"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:326
 msgid "show"
 msgstr ""
 
@@ -8435,7 +8503,7 @@ msgstr[1] ""
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:779 ../../include/conversation.php:210
+#: ../../include/text.php:779 ../../include/conversation.php:211
 msgid "poked"
 msgstr ""
 
@@ -8726,124 +8794,128 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:1036
+#: ../../include/nav.php:73 ../../boot.php:1036
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:46
+#: ../../include/nav.php:73
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1833
+#: ../../include/nav.php:76 ../../boot.php:1833
 msgid "Status"
 msgstr ""
 
-#: ../../include/nav.php:64
+#: ../../include/nav.php:91
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:104
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:81
+#: ../../include/nav.php:108
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:86
+#: ../../include/nav.php:113
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:89
+#: ../../include/nav.php:116
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:89
+#: ../../include/nav.php:116
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:91
+#: ../../include/nav.php:118
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:101
+#: ../../include/nav.php:128
 msgid "Conversations on this site"
 msgstr ""
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:130
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:130
 msgid "People directory"
 msgstr ""
 
-#: ../../include/nav.php:113
+#: ../../include/nav.php:140
 msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/nav.php:114
+#: ../../include/nav.php:141
 msgid "Network Reset"
 msgstr ""
 
-#: ../../include/nav.php:114
+#: ../../include/nav.php:141
 msgid "Load Network page with no filters"
 msgstr ""
 
-#: ../../include/nav.php:122
+#: ../../include/nav.php:149
 msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:151
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:152
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:156
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:157
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:131
+#: ../../include/nav.php:158
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:162
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:162
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:165
 msgid "Delegations"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../boot.php:1339
+#: ../../include/nav.php:169 ../../boot.php:1339
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:169
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:171
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:151
+#: ../../include/nav.php:178
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:175
-msgid "Nothing new here"
+#: ../../include/nav.php:182
+msgid "Navigation"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Site map"
 msgstr ""
 
 #: ../../include/contact_widgets.php:6
@@ -9162,7 +9234,7 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/acl_selectors.php:311
+#: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
 msgstr ""
 
@@ -9414,7 +9486,11 @@ msgstr ""
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:4057
+#: ../../include/items.php:3892
+msgid "Do you really want to delete this item?"
+msgstr ""
+
+#: ../../include/items.php:4085
 msgid "Archives"
 msgstr ""
 
@@ -9498,7 +9574,7 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/security.php:357
+#: ../../include/security.php:363
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -9508,138 +9584,154 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:818
+#: ../../include/Contact.php:225 ../../include/conversation.php:820
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:812
+#: ../../include/Contact.php:226 ../../include/conversation.php:814
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:813
+#: ../../include/Contact.php:227 ../../include/conversation.php:815
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:814
+#: ../../include/Contact.php:228 ../../include/conversation.php:816
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:815
+#: ../../include/Contact.php:229 ../../include/Contact.php:251
+#: ../../include/conversation.php:817
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:816
+#: ../../include/Contact.php:230 ../../include/Contact.php:251
+#: ../../include/conversation.php:818
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:817
+#: ../../include/Contact.php:231 ../../include/Contact.php:251
+#: ../../include/conversation.php:819
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:206
+#: ../../include/conversation.php:207
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:290
+#: ../../include/conversation.php:291
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:291
+#: ../../include/conversation.php:292
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:620 ../../object/Item.php:249
+#: ../../include/conversation.php:621 ../../object/Item.php:249
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:621 ../../object/Item.php:250
+#: ../../include/conversation.php:622 ../../object/Item.php:250
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:710
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:712
+#: ../../include/conversation.php:714
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:811
+#: ../../include/conversation.php:813
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:882
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:882
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:885
+#: ../../include/conversation.php:887
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:890
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:902
+#: ../../include/conversation.php:904
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:910
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:910
+#: ../../include/conversation.php:912
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:910
+#: ../../include/conversation.php:912
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:937 ../../include/conversation.php:955
+#: ../../include/conversation.php:939 ../../include/conversation.php:957
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:939 ../../include/conversation.php:957
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:958
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:941 ../../include/conversation.php:959
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:943 ../../include/conversation.php:961
+#: ../../include/conversation.php:945 ../../include/conversation.php:963
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:946
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:1023
+#: ../../include/conversation.php:988
+msgid "Post to Email"
+msgstr ""
+
+#: ../../include/conversation.php:1044
 msgid "permissions"
 msgstr ""
 
+#: ../../include/conversation.php:1068
+msgid "Post to Groups"
+msgstr ""
+
+#: ../../include/conversation.php:1069
+msgid "Post to Contacts"
+msgstr ""
+
+#: ../../include/conversation.php:1070
+msgid "Private post"
+msgstr ""
+
 #: ../../include/plugin.php:389 ../../include/plugin.php:391
 msgid "Click here to upgrade."
 msgstr ""