Index: indico/MaKaC/rb_reservation.py
===================================================================
--- indico/MaKaC/rb_reservation.py	(revision 05de6f13d94b653bf02af46ab5cf28f30905f8a0)
+++ indico/MaKaC/rb_reservation.py	(revision 55b3c5330cfa4bbf6c76a6810e510699031f6e22)
@@ -71,5 +71,5 @@
 
 # Room booking module notifications will be send to this e-mail when debug is on
-NOTIFICATION_SUBJECT_PREFIX = "[CRBS] "
+NOTIFICATION_SUBJECT_PREFIX = ""
 
 # Carbon copy of ALL room booking notifications will be send to this email
@@ -150,8 +150,8 @@
 
             if self.isConfirmed:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] You have made a New Booking on " + formatDateTime(self.startDT)
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingInsertion' )
             else:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Your PRE-Booking waits for Acceptance"
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] PRE-Booking waiting Acceptance"
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterPreBookingInsertion' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -177,8 +177,8 @@
 
         if self.isConfirmed:
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
             bookingMessage = "Book"
         else:
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New PRE-Booking on " + formatDateTime(self.startDT)
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New PRE-Booking on " + formatDateTime(self.startDT)
             bookingMessage = "PRE-book"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingInsertion' )
@@ -204,5 +204,5 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -248,5 +248,5 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingCancellation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date, 'firstName':firstName } )
@@ -271,5 +271,5 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingCancellation' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date } )
@@ -293,5 +293,5 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Cancelled on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Cancelled on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingCancellation' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -338,5 +338,5 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingRejection' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName, 'reason':reason, 'date':date } )
@@ -360,5 +360,5 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingRejection' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date, 'reason':reason } )
@@ -400,5 +400,5 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingConfirmation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -422,5 +422,5 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingConfirmation' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )
@@ -441,5 +441,5 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -480,5 +480,5 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Modified on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingModification' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -503,5 +503,5 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Modified on " + startDate
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingModification' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )
@@ -525,5 +525,5 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Modified booking on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Modified booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingModification' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -566,5 +566,5 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserRequestProlongation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -600,5 +600,5 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Consider Rejecting This Booking"
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Consider Rejecting This Booking"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleConsiderRejecting' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )