diff --git a/sources/attachments2.php b/sources/attachments2.php
index 5276bf617..cb2cc6b30 100755
--- a/sources/attachments2.php
+++ b/sources/attachments2.php
@@ -357,7 +357,7 @@ function do_comcode_attachments($original_comcode,$type,$id,$previewing_only=fal
 				// Search backwards from $marker
 				$tag_end_start=$marker-strlen('[/'.$attachment['tag_type'].']'); // </attachment> would be correct if it is Comcode-XML, but they have the same length, so it's irrelevant
 				$tag_start_end=$tag_end_start;
-				while (($tag_start_end>1) && ($new_comcode[$tag_start_end-1]!=']') && ($new_comcode[$tag_start_end-1]!='>')) $tag_start_end--;
+				while (($tag_start_end>1) && ((!isset($new_comcode[$tag_start_end-1])) || (($new_comcode[$tag_start_end-1]!=']') && ($new_comcode[$tag_start_end-1]!='>')))) $tag_start_end--;
 				$param_keep=substr($new_comcode,0,$tag_start_end-1);
 				$end_keep=substr($new_comcode,$tag_end_start);
 				if ($comcode_text)
diff --git a/sources/global2.php b/sources/global2.php
index acc86af3f..c1b800dbe 100644
--- a/sources/global2.php
+++ b/sources/global2.php
@@ -1815,7 +1815,7 @@ function javascript_tempcode($position=NULL)
 			$js->attach(do_template('JAVASCRIPT_NEED',array('_GUID'=>'b5886d9dfc4d528b7e1b0cd6f0eb1670','CODE'=>$j)));
 		}
 	}
-	$js->attach($JAVASCRIPT);
+	if (!is_null($JAVASCRIPT)) $js->attach($JAVASCRIPT);
 	return $js;
 }
 
diff --git a/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl b/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl
index 7066bdab1..2d01fe640 100755
--- a/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl
+++ b/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl
@@ -17,6 +17,25 @@
 
 		<h2>{!MORE_ACCOUNT_LINKS,{USERNAME*}}</h2>
 
+		{+START,IF,{VIEW_PROFILES}}
+			{+START,LOOP,CUSTOM_FIELDS}
+				{$SET,is_messenger_field,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME},{!DEFAULT_CPF_im_aim_NAME},{!DEFAULT_CPF_im_yahoo_NAME},{!DEFAULT_CPF_im_skype_NAME},{!DEFAULT_CPF_im_icq_NAME},{!DEFAULT_CPF_im_jabber_NAME},{!DEFAULT_CPF_sn_twitter_NAME},{!DEFAULT_CPF_sn_facebook_NAME},{!DEFAULT_CPF_sn_google_NAME}}}
+				{+START,IF,{$GET,is_messenger_field}}
+					{+START,SET,messenger_fields}
+						{$GET,messenger_fields}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME}}}<li><a title="{!ADD_AS_FRIEND}: {!LINK_NEW_WINDOW}" href="msnim:add?contact={VALUE*}">{!ADD_AS_FRIEND}</a> (Windows Live Messenger)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_aim_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="aim:goim?screename={VALUE*}">{!MESSAGE_THEM}</a> (AOL Instant Messenger)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_yahoo_NAME}}}<li><a title="{!ADD_AS_FRIEND}: {!LINK_NEW_WINDOW}" href="ymsgr:addfriend?{VALUE*}">{!ADD_AS_FRIEND}</a> (Yahoo Messenger)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_skype_NAME}}}<li><a title="{!PHONE_THEM_UP}: {!LINK_NEW_WINDOW}" href="skype:{VALUE*}?call">{!PHONE_THEM_UP}</a> (Skype)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_icq_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="http://www.icq.com/people/cmd.php?uin={VALUE*}&amp;action=message">{!MESSAGE_THEM}</a> (ICQ)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_jabber_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="xmpp:{VALUE*}">{!MESSAGE_THEM}</a> (Jabber/XMPP)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_twitter_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="http://twitter.com/{VALUE*}" rel="me">@{VALUE*}</a> (Twitter)</li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_facebook_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="{VALUE*}" rel="me">Facebook</a></li>{+END}
+						{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_google_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="{VALUE*}" rel="me">Google+</a></li>{+END}
+					{+END}
+				{+END}
+			{+END}
+		{+END}
 		{+START,IF_NON_EMPTY,{ACTIONS_contact}{$GET,messenger_fields}}
 			<div>
 				<h3>
@@ -100,27 +119,7 @@
 					{+START,IF,{VIEW_PROFILES}}
 						{+START,LOOP,CUSTOM_FIELDS}
 							{$SET,is_messenger_field,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME},{!DEFAULT_CPF_im_aim_NAME},{!DEFAULT_CPF_im_yahoo_NAME},{!DEFAULT_CPF_im_skype_NAME},{!DEFAULT_CPF_im_icq_NAME},{!DEFAULT_CPF_im_jabber_NAME},{!DEFAULT_CPF_sn_twitter_NAME},{!DEFAULT_CPF_sn_facebook_NAME},{!DEFAULT_CPF_sn_google_NAME}}}
-							{+START,IF,{$GET,is_messenger_field}}
-								{+START,SET,messenger_fields}
-									{$GET,messenger_fields}
-
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME}}}<li><a title="{!ADD_AS_FRIEND}: {!LINK_NEW_WINDOW}" href="msnim:add?contact={VALUE*}">{!ADD_AS_FRIEND}</a> (Windows Live Messenger)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_aim_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="aim:goim?screename={VALUE*}">{!MESSAGE_THEM}</a> (AOL Instant Messenger)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_yahoo_NAME}}}<li><a title="{!ADD_AS_FRIEND}: {!LINK_NEW_WINDOW}" href="ymsgr:addfriend?{VALUE*}">{!ADD_AS_FRIEND}</a> (Yahoo Messenger)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_skype_NAME}}}
-										<li>
-											{$,<a title="{!PHONE_THEM_UP}: {!LINK_NEW_WINDOW}" href="skype:{VALUE*}?call">{!PHONE_THEM_UP}</a> (Skype)}
-											<script type="text/javascript" src="http://download.skype.com/share/skypebuttons/js/skypeCheck.js"></script>
-											<a href="skype:{VALUE*}?call"><img src="http://mystatus.skype.com/bigclassic/{VALUE*}" style="border: none;" width="182" height="44" alt="My status" /></a>
-										</li>
-									{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_icq_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="http://www.icq.com/people/cmd.php?uin={VALUE*}&amp;action=message">{!MESSAGE_THEM}</a> (ICQ)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_jabber_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="xmpp:{VALUE*}">{!MESSAGE_THEM}</a> (Jabber/XMPP)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_twitter_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="http://twitter.com/{VALUE*}" rel="me">@{VALUE*}</a> (Twitter)</li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_facebook_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="{VALUE*}" rel="me">Facebook</a></li>{+END}
-									{+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_google_NAME}}}<li><a title="{!MESSAGE_THEM}: {!LINK_NEW_WINDOW}" href="{VALUE*}" rel="me">Google+</a></li>{+END}
-								{+END}
-							{+END}
+
 							{+START,IF,{$NOT,{$GET,is_messenger_field}}}
 								<tr>
 									<th class="de_th">