diff --git a/modules/planet/planet.controller.php b/modules/planet/planet.controller.php
index b47205546..22715aa5d 100644
--- a/modules/planet/planet.controller.php
+++ b/modules/planet/planet.controller.php
@@ -124,6 +124,8 @@
         function insertContent($obj,$manual_inserted=false){
 
             $obj->content = str_replace(array('<','>'),array('&lt;','&gt;'),$obj->content);
+            $obj->content = str_replace('...', '…', $obj->content);
+            $obj->content = str_replace('--', '—', $obj->content);
             $obj->content = preg_replace('/"([^"]*)":(http|ftp|https|mms)([^ ]+)/is','<a href="$2$3" onclick="window.open(this.href);return false;">$1</a>$4', $obj->content);
             $oDocumentController = &getController('document');
             $output = $oDocumentController->insertDocument($obj,$manual_inserted);
diff --git a/modules/planet/planet.model.php b/modules/planet/planet.model.php
index 5aff5018c..15cf1099d 100644
--- a/modules/planet/planet.model.php
+++ b/modules/planet/planet.model.php
@@ -543,6 +543,8 @@
             if($output->data) {
                 foreach($output->data as $key => $val) {
                     $output->data[$key]->content = preg_replace('/"([^"]*)":(http|ftp|https|mms)([^ ]+)/is','<a href="$2$3" onclick="window.open(this.href);return false;">$1</a>$4', $val->content);
+                    $output->data[$key]->content = str_replace('...', '…', $output->data[$key]->content);
+                    $output->data[$key]->content = str_replace('--', '—', $output->data[$key]->content);
 
                 }
             }