diff --git a/include/text.php b/include/text.php
index 57881e929..83588731f 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1425,11 +1425,12 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 
 					if (($filetype == 'image') AND ($item['network'] == NETWORK_OSTATUS)) {
 						$icon = '<img class="attached" src="'.$the_url.'" alt="" title="'.$title.'">';
+						$s .= '<br><a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attached" target="_blank" >' . $icon . '</a>';
 					} else {
 						$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
+						$as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" >' . $icon . '</a>';
 					}
 
-					$as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" >' . $icon . '</a>';
 				}
 			}
 		}