diff --git a/src/mirall/propagator_qnam.cpp b/src/mirall/propagator_qnam.cpp
index 280382e0e..8126b667f 100644
--- a/src/mirall/propagator_qnam.cpp
+++ b/src/mirall/propagator_qnam.cpp
@@ -191,8 +191,16 @@ void PropagateUploadFileQNAM::slotPutFinished()
                "It is restored and your edit is in the conflict file."))) {
             return;
         }
+        QString errorString = job->reply()->errorString();
 
-        done(classifyError(err, _item._httpErrorCode) , job->reply()->errorString());
+        QByteArray replyContent = job->reply()->readAll();
+        qDebug() << replyContent; // display the XML error in the debug
+        QRegExp rx("<s:message>(.*)</s:message>"); // Issue #1366: display server exception
+        if (rx.indexIn(QString::fromUtf8(replyContent)) != -1) {
+            errorString += QLatin1String(" (") + rx.cap(1) + QLatin1Char(')');
+        }
+
+        done(classifyError(err, _item._httpErrorCode), errorString);
         return;
     }