diff --git a/include/comment.php b/include/comment.php
index 3a9d0dc..9953d9b 100644
--- a/include/comment.php
+++ b/include/comment.php
@@ -76,7 +76,7 @@ class Comment {
             }
             if($sEmail)
             {
-                $sSubject = "Comment for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname;
+                $sSubject = "Comment for '".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)."' added by ".$_SESSION['current']->sRealname;
                 $sMsg  = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n";
                 $sMsg .= "\n";
                 $sMsg .= "Subject: ".$this->sSubject."\r\n";
diff --git a/include/version.php b/include/version.php
index 8cdf8a4..3c412e6 100644
--- a/include/version.php
+++ b/include/version.php
@@ -335,18 +335,18 @@ class Version {
                     addmsg("The version was successfully added into the database.", "green");
                 } else // Version queued.
                 {
-                    $sSubject = "Version ".$this->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname;
+                    $sSubject = "Version '".$this->sName."' of '".$oApp->sName."' submitted by ".$_SESSION['current']->sRealname;
                     $sMsg .= "This version has been queued.";
                     $sMsg .= "\n";
                     addmsg("The version you submitted will be added to the database database after being reviewed.", "green");
                 }
             break;
             case "edit":
-                $sSubject =  $oApp->sName." ".$this->sName." has been modified by ".$_SESSION['current']->sRealname;
+                $sSubject =  "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname;
                 addmsg("Version modified.", "green");
             break;
             case "delete":
-                $sSubject = "Version ".$this->sName." of ".$oApp->sName." has been deleted by ".$_SESSION['current']->sRealname;
+                $sSubject = "Version '".$this->sName." of ".$oApp->sName."' has been deleted by ".$_SESSION['current']->sRealname;
 
                 /* if replyText is set we should report the reason the application was deleted */
                 if($_REQUEST['replyText'])