diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 0f1796021d..d79a216c75 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -114,10 +114,9 @@ if (api_get_setting('use_custom_pages') == 'true') {
 				@api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin);
 			}
 			CustomPages::displayPage('registration-feedback');
-	}
-	}
-	else {
-	CustomPages::displayPage('registration');
+		}
+	} else {
+		CustomPages::displayPage('registration');
 	}
 }
 $tool_name = get_lang('Registration',null,(!empty($_POST['language'])?$_POST['language']:$_user['language']));
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
old mode 100755
new mode 100644
index bd5576bb04..697bd940b7
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -558,7 +558,7 @@ class MessageManager
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $current_uid = api_get_user_id();
         $group_id = intval($group_id);
-        $query = "SELECT * FROM $table_message WHERE group_id=$group_id AND msg_status <> ".MESSAGE_STATUS_OUTBOX." ORDER BY id";
+        $query = "SELECT * FROM $table_message WHERE group_id = $group_id AND msg_status <> ".MESSAGE_STATUS_OUTBOX." ORDER BY id ";
         $rs = Database::query($query);
         $data = array();
         $parents = array();
@@ -1004,7 +1004,8 @@ class MessageManager
         $main_message 	= self::get_message_by_id($topic_id);                
         $group_info		= GroupPortalManager::get_group_data($group_id);
         $rows 			= self::get_messages_by_group_by_message($group_id, $topic_id);            
-        $rows 			= self::calculate_children($rows, $topic_id);                
+        $rows 			= self::calculate_children($rows, $topic_id);
+        
         
         $current_user_id  = api_get_user_id();
         
diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php
index a9034b623f..a1b932e785 100644
--- a/main/inc/lib/system_announcements.lib.php
+++ b/main/inc/lib/system_announcements.lib.php
@@ -290,6 +290,8 @@ class SystemAnnouncementManager {
 	 * @return mixed  insert_id on success, false on failure
 	 */
 	public static function add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0, $lang = null, $send_mail = 0, $add_to_calendar = false ) {
+		
+		$original_content = $content;
 		$a_dateS = explode(' ',$date_start);
 		$a_arraySD = explode('-',$a_dateS[0]);
 		$a_arraySH = explode(':',$a_dateS[1]);
@@ -345,7 +347,8 @@ class SystemAnnouncementManager {
 		}
 		if ($add_to_calendar) {
 		    require_once 'calendar.lib.php';
-		    $agenda_id = agenda_add_item($title, $content, $date_start, $date_end);
+		    
+		    $agenda_id = agenda_add_item($title, $original_content, $date_start, $date_end);
 		}		
 		return Database::insert_id();
 	}
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 74f81192ae..07e80b4a3b 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -77,10 +77,11 @@ class UserManager {
 	public static function create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code = '', $language = '', $phone = '', $picture_uri = '', $auth_source = PLATFORM_AUTH_SOURCE, $expiration_date = '0000-00-00 00:00:00', $active = 1, $hr_dept_id = 0, $extra = null, $encrypt_method = '') {
 		global $_user, $userPasswordCrypted;
 
-		$firstName = Security::remove_XSS($firstName);
-		$lastName = Security::remove_XSS($lastName);
-		$loginName = Security::remove_XSS($loginName);
-		$phone = Security::remove_XSS($phone);
+		$firstName 	= Security::remove_XSS($firstName);
+		$lastName	= Security::remove_XSS($lastName);
+		$loginName 	= Security::remove_XSS($loginName);
+		$phone 		= Security::remove_XSS($phone);
+		
 		// database table definition
 		$table_user = Database::get_main_table(TABLE_MAIN_USER);
 
@@ -100,7 +101,7 @@ class UserManager {
 			return api_set_failure('login-pass already taken');
 		}
 		//$password = "PLACEHOLDER";
-		if($encrypt_method == '') {
+		if ($encrypt_method == '') {
 			$password = api_get_encrypted_password($password);
 		} else {
 			if ($userPasswordCrypted === $encrypt_method ) {
@@ -153,7 +154,7 @@ class UserManager {
 
 		} else {
 			//echo "false - failed" ;
-			$return=false;
+			$return = false;
 		}
 
 		if (is_array($extra) && count($extra) > 0) {
@@ -162,7 +163,7 @@ class UserManager {
 				$res = $res && self::update_extra_field_value($return, $fname, $fvalue);
 			}
 		}
-                self::update_extra_field_value($return, 'already_logged_in', 'false');
+		self::update_extra_field_value($return, 'already_logged_in', 'false');
 		return $return;
 	}
 
diff --git a/main/template/default/agenda/month.tpl b/main/template/default/agenda/month.tpl
index a0f42a68c2..c04ffc24f8 100644
--- a/main/template/default/agenda/month.tpl
+++ b/main/template/default/agenda/month.tpl
@@ -79,7 +79,8 @@ $(document).ready(function() {
 		eventRender: function(event, element) {
 			if (event.description) {
 				element.qtip({
-		            content: event.description
+		            content: event.description,
+		            position: { at:'bottom left'},	
 		        });
 			}