diff --git a/wp-atom.php b/wp-atom.php
index 0932afd979..62c0d0f545 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -34,16 +34,10 @@ $more = 1;
 		<id><?php the_guid(); ?></id>
 		<modified><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></modified>
 		<issued><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></issued>
-		<?php the_category_rss('rdf') ?>
+		<?php the_category_rss('rdf') ?> 
 		<summary type="<?php bloginfo('html_type'); ?>" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if (!get_settings('rss_use_excerpt')) : ?>
-	<?php if ( strlen( $post->post_content ) ) : ?>
+<?php if ( !get_settings('rss_use_excerpt') ) : ?>
 		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-	<?php else : ?>
-		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></content>
-	<?php endif; ?>
-<?php else : ?>
-		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
 <?php endif; ?>
 <?php rss_enclosure(); ?>
 	</entry>