Index: akonadi/server/src/response.cpp
===================================================================
--- akonadi/server/src/response.cpp	(revision 1106740)
+++ akonadi/server/src/response.cpp	(working copy)
@@ -71,12 +71,12 @@

 void Response::setUntagged( )
 {
-    m_tag = "*";
+    m_tag = QByteArray(1, '*');
 }

 void Response::setContinuation( )
 {
-    m_tag = "+";
+    m_tag = QByteArray(1, '+');
 }

 void Response::setString( const QByteArray & string )
Index: akonadi/server/src/interpreter.cpp
===================================================================
--- akonadi/server/src/interpreter.cpp	(revision 1106740)
+++ akonadi/server/src/interpreter.cpp	(working copy)
@@ -77,7 +77,7 @@
   if ( mIsLeaf ) {
     return QString( "(%1 %2 %3)" ).arg( mKey, mComparator, mPattern );
   } else {
-    QString text = "(";
+    QString text = '(';
     text += ( mRelation == And ? "&" : "|" );
     for ( int i = 0; i < mItems.count(); ++i )
       text += mItems[ i ]->dump();
Index: akonadi/server/src/handler/append.cpp
===================================================================
--- akonadi/server/src/handler/append.cpp	(revision 1106740)
+++ akonadi/server/src/handler/append.cpp	(working copy)
@@ -200,7 +200,7 @@
     // Date time is always stored in UTC time zone by the server.
     QString datetime = QLocale::c().toString( item.datetime(), QLatin1String( "dd-MMM-yyyy hh:mm:ss +0000" ) );

-    QByteArray res( "[UIDNEXT " + QByteArray::number( item.id() ) + " " );
+    QByteArray res( "[UIDNEXT " + QByteArray::number( item.id() ) + ' ' );
     res.append( "DATETIME " + ImapParser::quote( datetime.toUtf8() ) );
     res.append( ']' );

Index: akonadi/server/src/handler/fetchhelper.cpp
===================================================================
--- akonadi/server/src/handler/fetchhelper.cpp	(revision 1106740)
+++ akonadi/server/src/handler/fetchhelper.cpp	(working copy)
@@ -216,7 +216,7 @@
         data = PartHelper::translateData( data, partIsExternal );
       int version = partQuery.query().value( partQueryVersionColumn ).toInt();
       if ( version != 0 ) { // '0' is the default, so don't send it
-        part += "[" + QByteArray::number( version ) + "]";
+        part += '[' + QByteArray::number( version ) + ']';
       }
       if (  mExternalPayloadSupported && partIsExternal ) { // external data and this is supported by the client
         part += " [FILE] ";
Index: akonadi/server/src/akonadiconnection.cpp
===================================================================
--- akonadi/server/src/akonadiconnection.cpp	(revision 1106740)
+++ akonadi/server/src/akonadiconnection.cpp	(working copy)
@@ -121,7 +121,7 @@
       if ( tag.isEmpty() && m_streamParser->atCommandEnd() )
         continue;
       const QByteArray command = m_streamParser->readString();
-      Tracer::self()->connectionInput( m_identifier, QString::fromUtf8( tag + " " + command + " " + m_streamParser->readRemainingData() ) );
+      Tracer::self()->connectionInput( m_identifier, QString::fromUtf8( tag + ' ' + command + ' ' + m_streamParser->readRemainingData() ) );
       m_currentHandler = findHandlerForCommand( command );
       assert( m_currentHandler );
       connect( m_currentHandler, SIGNAL( responseAvailable( const Response & ) ),