22 files changed, 193 insertions, 182 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index c7cc08297..72cf8e4fd 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -12,7 +12,7 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://friendika.com" version="$version">Friendika</generator>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
diff --git a/view/de/strings.php b/view/de/strings.php
index b752ef2ea..7c110c093 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -239,11 +239,11 @@ $a->strings["Automatically expire posts after days:"] = "Einträge verfallen aut
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Einträge nie automatisch. Verfallene Einträge werden gelöscht.";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-Email senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhälst";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
 $a->strings["Your introductions are confirmed"] = "Eine deiner Vorstellungen angenommen wurde";
 $a->strings["Someone writes on your profile wall"] = "Jemand etwas auf deiner Pinnwand postet";
 $a->strings["Someone writes a followup comment"] = "Jemand auch einen Kommentar verfasst";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhälst";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten Einstellungen";
 $a->strings["Saved Searches"] = "Gespeicherte Suchen";
 $a->strings["Remove term"] = "Begriff entfernen";
@@ -822,7 +822,7 @@ $a->strings["Post to Twitter"] = "Nach Twitter senden";
 $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert.";
 $a->strings["Twitter Posting Settings"] = "Twitter Posting Einstellungen";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
-$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.";
+$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhältst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.";
 $a->strings["Log in with Twitter"] = "bei Twitter anmelden";
 $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter PIN hier her";
 $a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
diff --git a/view/en/cmnt_received_eml.tpl b/view/en/cmnt_received_eml.tpl
deleted file mode 100644
index d60fcd375..000000000
--- a/view/en/cmnt_received_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' commented on an item/conversation which you have been following.
-
------
-$body
------
-
-Please login at $siteurl to view the complete conversation:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
diff --git a/view/en/cmnt_received_html_body_eml.tpl b/view/en/cmnt_received_html_body_eml.tpl
deleted file mode 100644
index 95f56a4d5..000000000
--- a/view/en/cmnt_received_html_body_eml.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from commented on an item/conversation which you have been following.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-bottom:5px;"></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login to <a href="$display">view the complete conversation</a>.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$sitename Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/cmnt_received_text_body_eml.tpl b/view/en/cmnt_received_text_body_eml.tpl
deleted file mode 100644
index 7dcedeb0c..000000000
--- a/view/en/cmnt_received_text_body_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-Dear $username,
-
-	'$from' commented on an item/conversation which you have been following.
-	
------
-$body
------
-
-Please login at $siteurl to view the complete conversation:
-
-$display
-
-Thank you,
-	$sitename administrator
-\ No newline at end of file
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
deleted file mode 100644
index bd105a61b..000000000
--- a/view/en/mail_received_html_body_eml.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl/message">$siteurl/message</a> to read and reply to your private messages.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$siteName Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl
deleted file mode 100644
index 023867304..000000000
--- a/view/en/mail_received_text_body_eml.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-$from sent you a new private message at $siteName.
-	
-$title
-
-$textversion
-				
-Please login at $siteurl to read and reply to your private messages.
-
-Thank you,
-$siteName administrator
diff --git a/view/en/wall_received_eml.tpl b/view/en/wall_received_eml.tpl
deleted file mode 100644
index c296de785..000000000
--- a/view/en/wall_received_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' posted something to your profile wall.
-
------
-$body
------
-
-Please login at $siteurl to view or delete the item:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
diff --git a/view/en/wall_received_html_body_eml.tpl b/view/en/wall_received_html_body_eml.tpl
deleted file mode 100644
index 91ef61e29..000000000
--- a/view/en/wall_received_html_body_eml.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from posted something to your profile wall.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to <a href="$display">view or delete the post</a>.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$sitename Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/wall_received_text_body_eml.tpl b/view/en/wall_received_text_body_eml.tpl
deleted file mode 100644
index c296de785..000000000
--- a/view/en/wall_received_text_body_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' posted something to your profile wall.
-
------
-$body
------
-
-Please login at $siteurl to view or delete the item:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 4186ef78e..cdef9ef83 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,6 +7,7 @@ var textlen = 0;
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();	
+		$("#jot-title-desc").show();
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
@@ -108,11 +109,46 @@ function enableOnUser(){
 <script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
+
 	$(document).ready(function() {
 		
+<<<<<<< HEAD
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
+=======
+		/* enable tinymce on focus */
+		$("#profile-jot-text").focus(function(){
+			if (editor) return;
+			$(this).val("");
+			initEditor();
+		});
+
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
+		});
+
+		$("#jot-title-display").hover(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+>>>>>>> friendica/master
 	
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/jot.tpl b/view/jot.tpl
index e20d17b22..12df0d9c2 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -10,6 +10,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>		
 		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/settings.tpl b/view/settings.tpl
index e15976581..6310ff47e 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -107,6 +107,7 @@ $suggestme
 {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
 </div>
 
 
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 7a1012230..79db0ec5a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+		$("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -100,6 +101,31 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
+		});
+
+		$("#jot-title-display").hover(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index a2c883e4b..0ceddb3b7 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -14,8 +14,13 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-title-wrapper">
+		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -49,9 +54,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-plugin-wrapper" style="display: none;">
   	$jotplugins
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 0d8b54698..08582f1d5 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -342,6 +342,22 @@ aside #viewcontacts { text-align: right;}
 #acl-deny-text-end { clear: both; }
 
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+#jot-title-display {
+	font-weight: bold;
+}
+
 
 /**
  * section
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
index 78cbecea8..36008c5a1 100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -12,41 +12,47 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-title-wrapper">
+		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
 
 		{{ if $content }}<script>initEditor();</script>{{ endif }}
 
-<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+<div id="profile-jot-submit-wrapper" style="display:none">
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload">image upload</a></div>
 	</div> 
 	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach">attach file</a></div>
 	</div> 
 
 	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+		<a id="profile-link" class="link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">enter link</a>
 	</div> 
 	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+		<a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;">video url</a>
 	</div> 
 	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+		<a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</a>
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;">set location</a>
 	</div> 
 	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-	<div id="profile-title-wrapper" style="display: $visitor;" >
-		<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
 	</div> 
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate"  title="$permset" >permissions</a>$bang
+	</div>
+<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms-end"></div>
 
 	<div id="profile-jot-plugin-wrapper">
   	$jotplugins
@@ -55,10 +61,6 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-	<div id="profile-jot-perms-end"></div>
 	
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6582d068..6ce4c52c0 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -269,6 +269,22 @@ div.wall-item-content-wrapper.shiny {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+#jot-title-display {
+	font-weight: bold;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
 .fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 222edc166..6b8aef500 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -131,6 +131,23 @@ blockquote:before {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
+#jot-title-display {
+	font-weight: bold;
+}
+
 .fakelink, .fakelink:visited {
 	color: #15607B;
 	text-decoration: none;
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 62351e173..7b2dca9fe 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+		$("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -122,6 +123,32 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
+		});
+
+		$("#jot-title-display").hover(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 7ccaf2aa2..fa655a13e 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -14,8 +14,14 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+
+		<div id="jot-title-wrapper">
+        <span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
+        <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+        </div>
 
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -42,9 +48,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index d1d344ef9..3a5d9f178 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -744,6 +744,23 @@ ul .sidebar-group-li .icon{
 #profile-jot-submit-wrapper { 
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 460px;
+}
+
+#jot-title-display {
+	font-weight: bold;
+}
+
 #profile-jot-perms, #profile-jot-submit {
 	width: 60px;
 	font-size: 12px;