diff --git a/upload/admin/admin_attach_cp.php b/upload/admin/admin_attach_cp.php
index 0f44b11d2..10fed9d8b 100644
--- a/upload/admin/admin_attach_cp.php
+++ b/upload/admin/admin_attach_cp.php
@@ -524,7 +524,7 @@ if ($view == 'attachments')
 
 					if (strlen($post_title) > 32)
 					{
-						$post_title = substr($post_title, 0, 30) . '...';
+						$post_title = str_short($post_title, 30);
 					}
 
 					$view_topic = append_sid(BB_ROOT . 'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']);
diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php
index d993dc4d6..05697399e 100644
--- a/upload/ajax/posts.php
+++ b/upload/ajax/posts.php
@@ -168,7 +168,7 @@ switch($this->request['type'])
 					</div>
 					<textarea id="message-'. $post_id .'" class="editor mrg_4" name="message" rows="18" cols="92">'. $post['post_text'] .'</textarea>
 					<div class="mrg_4 tCenter">
-						<input title="Alt+Enter" type="submit" value="'.$lang['PREVIEW'].'">
+						<input title="Alt+Enter" name="preview" type="submit" value="'.$lang['PREVIEW'].'">
 						<input type="button" onclick="edit_post('. $post_id .');" value="'. $lang['CANCEL'] .'">
 						<input type="button" onclick="edit_post('. $post_id .', \'editor\', $(\'#message-'. $post_id .'\').val()); return false;" class="bold" value="'. $lang['SUBMIT'] .'">
 					</div><hr>
diff --git a/upload/config.php b/upload/config.php
index 0b4f86308..7c35d9755 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R304';
+$bb_cfg['tp_release_state'] = 'R305';
 $bb_cfg['tp_release_date'] = '05-11-2011';
 
 // Database