diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 7cd5f30e2..b1c9c72d9 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -118,10 +118,10 @@ ChatWidget::ChatWidget(QWidget *parent) :
 
 	ui->chatTextEdit->installEventFilter(this);
 
-//#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700
 	// embedded images are not supported before QT 4.7.0
 	ui->attachPictureButton->setVisible(false);
-//#endif
+#endif
 
 	resetStatusBar();
 }
diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.cpp b/retroshare-gui/src/gui/common/MimeTextEdit.cpp
index e6a69dccb..284a43014 100644
--- a/retroshare-gui/src/gui/common/MimeTextEdit.cpp
+++ b/retroshare-gui/src/gui/common/MimeTextEdit.cpp
@@ -33,11 +33,11 @@ bool MimeTextEdit::canInsertFromMimeData(const QMimeData* source) const
 {
 #if QT_VERSION >= 0x040700
 	// embedded images are not supported before QT 4.7.0
-//	if (source != NULL) {
-//		if (source->hasImage()) {
-//			return true;
-//		}
-//	}
+	if (source != NULL) {
+		if (source->hasImage()) {
+			return true;
+		}
+	}
 #endif
 
 	return QTextEdit::canInsertFromMimeData(source);
@@ -47,20 +47,20 @@ void MimeTextEdit::insertFromMimeData(const QMimeData* source)
 {
 #if QT_VERSION >= 0x040700
 	// embedded images are not supported before QT 4.7.0
-//	if (source != NULL) {
-//		if (source->hasImage()) {
-//			// insert as embedded image
-//			QImage image = qvariant_cast<QImage>(source->imageData());
-//			if (image.isNull() == false) {
-//				QString	encodedImage;
-//				if (RsHtml::makeEmbeddedImage(image, encodedImage, 640*480)) {
-//					QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
-//					this->textCursor().insertFragment(fragment);
-//					return;
-//				}
-//			}
-//		}
-//	}
+	if (source != NULL) {
+		if (source->hasImage()) {
+			// insert as embedded image
+			QImage image = qvariant_cast<QImage>(source->imageData());
+			if (image.isNull() == false) {
+				QString	encodedImage;
+				if (RsHtml::makeEmbeddedImage(image, encodedImage, 640*480)) {
+					QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
+					this->textCursor().insertFragment(fragment);
+					return;
+				}
+			}
+		}
+	}
 #endif
 
 	return QTextEdit::insertFromMimeData(source);
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 6e991082f..8eda67c06 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -310,10 +310,10 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
     ui.hashBox->setDropWidget(this);
     ui.hashBox->setAutoHide(true);
 
-//#if QT_VERSION < 0x040700
-	// embedded images are not supported before QT 4.7.0
+#if QT_VERSION < 0x040700
+    // embedded images are not supported before QT 4.7.0
     ui.imagebtn->setVisible(false);
-//#endif
+#endif
 
     /* Hide platform specific features */
 #ifdef Q_WS_WIN