diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 7e29692b..df22942b 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -2366,11 +2366,13 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
         if("" != pMimeData->text()){
             // Sometimes, it is possible to have an URL as text. we check here if it is the case
             QString qsTmp = pMimeData->text().remove(QRegExp("[\\0]"));
-            if(qsTmp.startsWith("http")){
+            if(qsTmp.startsWith("http"))
                 downloadURL(QUrl(qsTmp), QString(), pPos);
-            }
             else{
-                mActiveScene->addTextHtml(pMimeData->html(), pPos);
+                if(mActiveScene->selectedItems().at(0)->type() == UBGraphicsItemType::TextItemType)
+                    dynamic_cast<UBGraphicsTextItem*>(mActiveScene->selectedItems().at(0))->setHtml(pMimeData->text());
+                else
+                    mActiveScene->addTextHtml(pMimeData->text(), pPos);
             }
         }
         else{
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 4f5fd3ea..d3116613 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -449,7 +449,7 @@ void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QStrin
 
         if ( fullFileName.contains(".thumbnail."))
             continue;
- 
+
         UBFeature testFeature(currVirtualPath + "/" + fileName, icon, fileName, QUrl::fromLocalFile(fullFileName), featureType);
 
         featuresList->append(testFeature);
@@ -750,17 +750,17 @@ void UBFeaturesController::importImage( const QImage &image, const UBFeature &de
         QDateTime now = QDateTime::currentDateTime();
         static int imageCounter = 0;
         mFileName  = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss");
-        
+
         filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
 
         if (QFile::exists(filePath+".png"))
             mFileName += QString("-[%1]").arg(++imageCounter);
         else
             imageCounter = 0;
-        
+
         mFileName += ".png";
     }
-    
+
 
     if ( !destination.getFullVirtualPath().startsWith( picturesElement.getFullVirtualPath(), Qt::CaseInsensitive ) )
     {
@@ -861,7 +861,7 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
 
     QString fileName;
     QString filePath;
-    
+
     //Audio item
     if(dest == picturesElement) {
 
@@ -913,7 +913,7 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
 
     UBFeature dest = destination;
 
-    if ( destination != trashElement && 
+    if ( destination != trashElement &&
         !destination.getFullVirtualPath().startsWith( possibleDest.getFullVirtualPath(), Qt::CaseInsensitive ) )
     {
         dest = possibleDest;
@@ -930,9 +930,9 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
     }
 
     QImage thumb = getIcon( newFullPath );
-    
+
     UBFeatureElementType type = FEATURE_ITEM;
-    if ( UBFileSystemUtils::mimeTypeFromFileName( newFullPath ).contains("application") ) 
+    if ( UBFileSystemUtils::mimeTypeFromFileName( newFullPath ).contains("application") )
         type = FEATURE_INTERACTIVE;
     UBFeature newElement( destVirtualPath + "/" + name, thumb, name, QUrl::fromLocalFile( newFullPath ), type );
     return newElement;
@@ -1042,11 +1042,8 @@ void UBFeaturesController::moveExternalData(const QUrl &url, const UBFeature &de
 
     UBFeature dest = destination;
 
-    if ( destination != trashElement && destination != UBFeature()
-       /*&& !destination.getFullVirtualPath().startsWith( possibleDest.getFullVirtualPath(), Qt::CaseInsensitive )*/ )
-    {
+    if ( destination != trashElement && destination != UBFeature())
         dest = possibleDest;
-    }
 
     UBFeatureElementType type = fileTypeFromUrl(sourcePath);