diff --git a/feed.php b/feed.php
index 98d5ef2e83bff16fe59c6b04524f7839ba4466f5..dafbb3c0763e2e1e7912ed7d9b4e5fc68d9a0792 100644
--- a/feed.php
+++ b/feed.php
@@ -324,6 +324,10 @@ function rss_buildItems(&$rss,&$data,$opt){
                         // no TOC in feeds
                         $content = preg_replace('/(<!-- TOC START -->).*(<!-- TOC END -->)/s','',$content);
 
+                        // add alignment for images
+                        $content = preg_replace('/class="medialeft"/s', 'class="medialeft" align="left"', $content);
+                        $content = preg_replace('/class="mediaright"/s', 'class="mediaright" align="right"', $content);
+
                         // make URLs work when canonical is not set, regexp instead of rerendering!
                         if(!$conf['canonical']){
                             $base = preg_quote(DOKU_REL,'/');
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 157d0d76a5ee0ca8c23ae43c932dba264b6e9d0d..4514a18a49948e72f870fe2dca6ba7f58881cd38 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1075,10 +1075,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache)).'"';
             $ret .= ' class="media'.$align.'"';
 
-            // make left/right alignment for no-CSS view work (feeds)
-            if($align == 'right') $ret .= ' align="right"';
-            if($align == 'left')  $ret .= ' align="left"';
-
             if ($title) {
                 $ret .= ' title="' . $title . '"';
                 $ret .= ' alt="'   . $title .'"';